From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Feb 2010 19:32:22 +0000 (-0500)
Subject: Merge remote branch 'sebastian/manpage'
X-Git-Tag: tor-0.2.2.10-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b93dacbcfbca7b4653f7a9b727bdc209aff1e7c;p=thirdparty%2Ftor.git

Merge remote branch 'sebastian/manpage'
---

8b93dacbcfbca7b4653f7a9b727bdc209aff1e7c
diff --cc ChangeLog
index 548c8d8c78,ea474e7265..f09671f171
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,11 -5,9 +5,13 @@@ Changes in version 0.2.2.10-alpha - 201
      - Fix a dereference-then-NULL-check sequence when publishing
        descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,
        fixes bug 1255.
+     - Disallow values larger than INT32_MAX for PerConnBWRate|Burst
+       config option. Bugfix on 0.2.2.7-alpha.
  
 +  o Code simplifications and refactoring:
 +    - Fix some urls in the exit notice file and make it XHTML1.1 strict
 +      compliant. Based on a patch from Christian Kujau.
 +
  Changes in version 0.2.2.9-alpha - 2010-02-22
    o Directory authority changes:
      - Change IP address for dannenberg (v3 directory authority), and