Merge maint-0.2.2: do not take manpage change from bug2450.
commit1a4bb533bbd7c5e2fe3db9962a3474a5c46475b7
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Feb 2011 19:00:59 +0000 (3 14:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Feb 2011 19:00:59 +0000 (3 14:00 -0500)
treeb0507e841fa38573a8fd8601368a7fed08917041
parent974345b7132ab2028faf7d6168981adb06a97491
parentabb584bfb88e7412e1ecdeecd551d9cfe472e4bc
Merge maint-0.2.2: do not take manpage change from bug2450.