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

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

c1a2be9ffe89423a71eb0d73ea108f22966fcfb0