Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
commitd37660d3f366c6749d241623ebce4733279509ee
authorNick Mathewson <nickm@torproject.org>
Thu, 10 Feb 2011 21:01:19 +0000 (10 16:01 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 10 Feb 2011 21:01:19 +0000 (10 16:01 -0500)
tree9189fef6dee39a75cb7b152aa656d958b3bb542a
parent7abb74e4ac3f284f0682764dd5f26571dd624c13
parent6f07363e72b2ba7424ec64d3f294e2646a620705
Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
doc/tor.1.txt