Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2
commit6f5886dd1b5a93a1c2c4d521db28e7974224ee2a
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Nov 2010 19:07:00 +0000 (15 14:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Nov 2010 19:07:00 +0000 (15 14:07 -0500)
tree8bc39dafd68d2bbad5edc43d62d1ec46a3ad3d2d
parentda98b9bdb2c1272e6a9f60c4ad708dc09053990f
parent2e1d1256e34b03be7ff944e8053ec508af1d25d9
Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2