Merge remote branch 'sebastian/manpage'

diff --cc ChangeLog
index 548c8d8c78953ae7941897a867109f2cc797c947,ea474e72658a549667c397e4e92e75a81c31c588..f09671f17175366a7fe1ccc2c57c02fdd9c90803
--- 1/ChangeLog
--- 2/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