[tor-commits] [tor/release-0.2.6] Fold everything into changelog, remove already-folded-in changes

[nickm at torproject.org]

commit 90a0a0ca7ae5495cf990d7694f11e4b454e5cf6e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 09:07:52 2015 -0400

    Fold everything into changelog, remove already-folded-in changes
---
 ChangeLog             |    4 ++++
 changes/bug15240      |    6 ------
 changes/bug15245      |    5 -----
 changes/bug9495_redux |    4 ----
 changes/ticket15176   |    3 ---
 changes/ticket15212   |    6 ------
 6 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d1009be..2e86892 100644
--- a/ChangeLog
+++ b/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.
diff --git a/changes/bug15240 b/changes/bug15240
deleted file mode 100644
index e11f804..0000000
--- a/changes/bug15240
+++ /dev/null
@@ -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.
diff --git a/changes/bug15245 b/changes/bug15245
deleted file mode 100644
index 520a370..0000000
--- a/changes/bug15245
+++ /dev/null
@@ -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".
-
diff --git a/changes/bug9495_redux b/changes/bug9495_redux
deleted file mode 100644
index 74b0cdf..0000000
--- a/changes/bug9495_redux
+++ /dev/null
@@ -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".
diff --git a/changes/ticket15176 b/changes/ticket15176
deleted file mode 100644
index 6d12723..0000000
--- a/changes/ticket15176
+++ /dev/null
@@ -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.
diff --git a/changes/ticket15212 b/changes/ticket15212
deleted file mode 100644
index 2c41e38..0000000
--- a/changes/ticket15212
+++ /dev/null
@@ -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.