Merge remote branch 'sebastian/continuation'release-0.2.2
commitc8e1538a0bdcb83dc2aeec075dcffdcac5bf45b7
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Sep 2010 17:43:55 +0000 (24 13:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Sep 2010 17:43:55 +0000 (24 13:43 -0400)
treef933499da338335c3454a4e82151a1d3af59341e
parent9b49a89430eac9a50fdb067aefec9d1561872796
parent851255170aaa419e9c8f2a7d1b3c7a124a9c2783
Merge remote branch 'sebastian/continuation'
doc/tor.1.txt