Merge remote-tracking branch 'origin/maint-0.2.2'
commit281aa2e237586a1086c3f589ed35a74eda4f1a27
authorNick Mathewson <nickm@torproject.org>
Wed, 23 Nov 2011 17:12:52 +0000 (23 12:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 23 Nov 2011 17:12:52 +0000 (23 12:12 -0500)
tree33c88e79e41e89e52603e65bf84f85a46a624fe7
parente18fa28248e8210f1c2967a859b24845c9f8ef38
parent841247a5864064ce031988ca2dab5808b11408b2
Merge remote-tracking branch 'origin/maint-0.2.2'