From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Apr 2012 13:26:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.14-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5465ac5ea3888fb86bd09d81f6f2ab5a8d7c9baf;p=thirdparty%2Ftor.git

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

5465ac5ea3888fb86bd09d81f6f2ab5a8d7c9baf