fold in further changes files

6 files changed, 15 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 43ce2395ed..e981880d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,8 @@ Changes in version 0.2.2.36 - 2012-04-??
       bugfix on 0.2.2.29-beta. Bug found by wanoskarnet.
 
   o Minor bugfixes:
+    - Reject out-of-range times like 23:59:61 in parse_rfc1123_time().
+      Fixes bug 5346; bugfix on 0.0.8pre3.
     - Make our number-parsing functions always treat too-large values
       as an error, even when those values exceed the width of the
       underlying type. Previously, if the caller provided these
@@ -75,6 +77,10 @@ Changes in version 0.2.2.36 - 2012-04-??
       no such remote address to learn, and our method for trying to
       learn it was incorrect. Fixes bugs 1240, 4745, and 4747. Bugfix
       on 0.1.0.3-rc. Reported and diagnosed by "r1eo".
+    - Correct parsing of certain date types in parse_http_time().
+      Without this patch, If-Modified-Since would behave
+      incorrectly. Fixes bug 5346; bugfix on 0.2.0.2-alpha. Patch from
+      Esteban Manchado Velázques.
     - Change the BridgePassword feature (part of the "bridge community"
       design, which is not yet implemented) to use a time-independent
       comparison. The old behavior might have allowed an adversary
@@ -95,6 +101,12 @@ Changes in version 0.2.2.36 - 2012-04-??
       CFLAGS. clang doesn't support them yet.
     - When sending an HTTP/1.1 proxy request, include a Host header.
       Fixes bug 5593; bugfix on 0.2.2.1-alpha.
+    - Fix a NULL-pointer dereference on a badly formed SETCIRCUITPURPOSE
+      command. Found by mikeyc. Fixes bug 5796; bugfix on 0.2.2.9-alpha.
+    - If we hit the error case where routerlist_insert() replaces an
+      existing (old) server descriptor, make sure to remove that
+      server descriptor from the old_routers list. Fix related to bug
+      1776. Bugfix on 0.2.2.18-alpha.
 
   o Minor bugfixes (documentation and log messages):
     - Fix a typo in a log message in rend_service_rendezvous_has_opened().
@@ -109,6 +121,8 @@ Changes in version 0.2.2.36 - 2012-04-??
       bug 5067; bugfix on 0.2.0.10-alpha.
     - Correctly spell "connect" in a log message on failure to create a
       controlsocket. Fixes bug 4803; bugfix on 0.2.2.26-beta.
+    - Clarify the behavior of MaxCircuitDirtiness with hidden service
+      circuits. Fixes issue 5259.
 
   o Minor features:
     - Directory authorities now reject versions of Tor older than
@@ -116,7 +130,7 @@ Changes in version 0.2.2.36 - 2012-04-??
       inclusive. These versions accounted for only a small fraction of
       the Tor network, and have numerous known security issues. Resolves
       issue 4788.
-    - Update to the April 3 2012 Maxmind GeoLite Country database.
+    - Update to the May 1 2012 Maxmind GeoLite Country database.
 
   - Feature removal:
     - When sending or relaying a RELAY_EARLY cell, we used to convert
diff --git a/changes/bug5259 b/changes/bug5259
deleted file mode 100644
index bdada586e9..0000000000
--- a/changes/bug5259
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation fixes:
-    - Clarify the behavior of MaxCircuitDirtiness with hidden service
-      circuits. Fix for issue 5259.
diff --git a/changes/bug5346 b/changes/bug5346
deleted file mode 100644
index 3d21f90144..0000000000
--- a/changes/bug5346
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-    - Correct parsing of certain date types in parse_http_time().
-      Without this patch, If-Modified-Since would behave
-      incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from
-      Esteban Manchado Velázques.
-    - Reject out-of-range times like 23:59:61. Fix for bug 5346;
-      bugfix on 0.0.8pre3.
-
diff --git a/changes/bug5796 b/changes/bug5796
deleted file mode 100644
index b92659f74a..0000000000
--- a/changes/bug5796
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (controller):
-    - Fix a NULL-pointer derefernce on a badly formed
-      SETCIRCUITPURPOSE command. Found by mikeyc. Fixes bug 5796;
-      bugfix on 0.2.2.9-alpha.
diff --git a/changes/geoip-may2012 b/changes/geoip-may2012
deleted file mode 100644
index 1575eced87..0000000000
--- a/changes/geoip-may2012
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the May 1 2012 Maxmind GeoLite Country database.
-
diff --git a/changes/routerlist_ins_replace b/changes/routerlist_ins_replace
deleted file mode 100644
index 7b442a2f5d..0000000000
--- a/changes/routerlist_ins_replace
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - If we hit the error case where routerlist_insert() replaces an
-      existing (old) server descriptor, make sure to remove that
-      server descriptor from the old_routers list. Fix related to bug
-      1776. Bugfix on 0.2.2.18-alpha.