Merge branch 'bug2279' into maint-0.2.2
commit98cef0ac1e94fbcf7d1f9f70e077f22624033ecc
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Feb 2011 17:43:54 +0000 (7 12:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Feb 2011 17:43:54 +0000 (7 12:43 -0500)
tree624391497bc20e75f26116622514242eb6692f8d
parente9803aa71003079cc00a8b3c80324581758a36be
parente854e01d5713108cf28e99ef9bc15ea27cb30759
Merge branch 'bug2279' into maint-0.2.2
doc/tor.1.txt