Merge remote-tracking branch 'origin/maint-0.2.2'
commit93d3a917e878e42950faf6199205a6933a40c900
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Jan 2012 19:45:18 +0000 (18 14:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Jan 2012 19:45:18 +0000 (18 14:45 -0500)
tree65a10b7e40f52d975caa7e92f140e9caa9e67192
parentee717f35c44fa0ec3fc37ca8865a80e321105c33
parent676bba8e0c91b7885aa8a9b7f55b008ccccfe282
Merge remote-tracking branch 'origin/maint-0.2.2'
doc/tor.1.txt