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

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

f75660958cc62422d158f9284b7fcfdee9fa9b95