From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Nov 2011 21:23:24 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07a5fd10544be1ce382e02824617685d960ab3b7;p=thirdparty%2Ftor.git

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

07a5fd10544be1ce382e02824617685d960ab3b7