From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Nov 2011 15:28:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9452b65680deee698dbc8c4eae929aba3b75b198;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'
---

9452b65680deee698dbc8c4eae929aba3b75b198