Merge branch 'bug6732' into maint-0.2.3
commitb17bb543dab3e34f5076649707bc74d5d3bd62fd
authorNick Mathewson <nickm@torproject.org>
Fri, 31 Aug 2012 22:39:11 +0000 (31 18:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 31 Aug 2012 22:39:11 +0000 (31 18:39 -0400)
treec60b4d250e5d931eed18c7b73eec73066f4278f6
parenta7a4bbff47c92aa4df0a932492867d1601834118
parent774979ca4584036d17dd96071ec565955d9f04a7
Merge branch 'bug6732' into maint-0.2.3
doc/tor.1.txt