Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
commit2b7bdc295a516df457246fb69f83c8667695c59b
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 16:10:27 +0000 (14 11:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 16:10:27 +0000 (14 11:10 -0500)
treea442a9bb178def728905f37d7fc4236f8e6b3318
parent8adec8705014ef7e788a1dcf5d3a4a2d85a328ed
parent13f02c387f894a8b11088926c44c6d8ad89adbf7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2