Fold everything into changelog, remove already-folded-in changes

ChangeLog

@@ -25,6 +25,10 @@ Changes in version 0.2.6.5-?? - 2015-03-??
       know if removing support for very old versions of the Tor
       protocols is harming the network. Closes ticket 15212.
 
+  o Code simplification and refactoring:
+    - Refactor main loop to extract the 'loop' part. This makes it
+      easier to run Tor under Shadow. Closes ticket 15176.
+
 
 Changes in version 0.2.5.11 - 2015-03-17
   Tor 0.2.5.11 is the second stable release in the 0.2.5 series.

changes/bug15240

@@ -1,6 +0,0 @@
-  o Minor bugfixes (pluggable transports):
-    - Initialize the extended OR Port authentication cookie before launching
-      pluggable transports. This prevents a race condition that occured when
-      server-side pluggable transports would cache the authentication cookie
-      before it has been (re)generated. Fixes bug 15240; bugfix on
-      0.2.5.1-alpha.

changes/bug15245

@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Avoid crashing when making certain configuration option changes
-      on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported
-      by "anonym".
-

changes/bug9495_redux

@@ -1,4 +0,0 @@
-  o Major bugfixes (portability):
-    - Do not crash on startup when running on Solaris. Fixes a bug
-      related to our fix for 9495; bugfix on 0.2.6.1-alpha. Reported
-      by "ruebezahl".

changes/ticket15176

@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Refactor main loop to extract the 'loop' part.  This makes it easier
-      to run Tor under Shadow. Closes ticket 15176.

changes/ticket15212

@@ -1,6 +0,0 @@
-  o Minor features (heartbeat):
-
-    - On relays, report how many connections we negotiated using each
-      version of the Tor link protocols. This information will let us
-      know if removing support for very old versions of the Tor
-      protocols is harming the network. Closes ticket 15212.