From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 May 2012 14:57:08 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.16-alpha~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3046fd5e576bc7294374a8bbab1a80cd3fb3524;p=thirdparty%2Ftor.git

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

a3046fd5e576bc7294374a8bbab1a80cd3fb3524