From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 5 Apr 2013 20:58:26 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25f9ecf4b203ed6a524b1d78ff2e38a2d0583d88;p=thirdparty%2Ftor.git

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

25f9ecf4b203ed6a524b1d78ff2e38a2d0583d88