Merge remote-tracking branch 'origin/maint-0.2.2'
commit9292a78722e0f24d06e15215ba25f05e534646d6
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 16:10:45 +0000 (14 11:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 16:10:45 +0000 (14 11:10 -0500)
tree26b2b3ff51d5c5e52c424f9bb9fa168572778d3f
parentaf12a7ac002cd1900e586461baac617b68a624f8
parent2b7bdc295a516df457246fb69f83c8667695c59b
Merge remote-tracking branch 'origin/maint-0.2.2'