From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 31 May 2012 21:00:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.16-alpha~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0cbe3ff313deb6ef7807b07f922a567e8e1274bd;p=thirdparty%2Ftor.git

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

0cbe3ff313deb6ef7807b07f922a567e8e1274bd