From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 May 2013 18:54:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=382dbe9819367cb838f1099f5f29897f8f5f8f51;p=thirdparty%2Ftor.git

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

382dbe9819367cb838f1099f5f29897f8f5f8f51