[tor-commits] [tor/release-0.2.2] fold in latest changes

[arma at torproject.org]

commit d06ea86850704084670ec864a685a5e857c3a6a6
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu May 10 16:10:56 2012 -0400

    fold in latest changes
---
 ChangeLog             |    7 +++++++
 changes/bug5760       |    3 ---
 changes/bug5786_range |    8 --------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd3e90e..43ce239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,13 @@ Changes in version 0.2.2.36 - 2012-04-??
       bugfix on 0.2.2.29-beta. Bug found by wanoskarnet.
 
   o Minor bugfixes:
+    - 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
+      functions with minima or maxima set to the extreme values of the
+      underlying integer type, these functions would return those
+      values on overflow rather than treating overflow as an error.
+      Fixes part of bug 5786; bugfix on 0.0.9.
     - Older Linux kernels erroneously respond to strange nmap behavior
       by having accept() return successfully with a zero-length
       socket. When this happens, just close the connection. Previously,
diff --git a/changes/bug5760 b/changes/bug5760
deleted file mode 100644
index a26407b..0000000
--- a/changes/bug5760
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes:
-    - End AUTHCHALLENGE error response messages with a CRLF. Fixes bug 5760;
-      bugfix on 0.2.3.16-alpha, and backported to maint-0.2.2
diff --git a/changes/bug5786_range b/changes/bug5786_range
deleted file mode 100644
index 40ac4d2..0000000
--- a/changes/bug5786_range
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-    - 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
-      functions with minima or maxima set to the extreme values of the
-      underlying integer type, these functions would return those
-      values on overflow rather than treating overflow as an error.
-      Fix for part of bug 5786; bugfix on Tor 0.0.9.
\ No newline at end of file