From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Apr 2013 05:47:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e54a5a4f3c65dc8ab5470a91a48f500982b7d10e;p=thirdparty%2Ftor.git

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

e54a5a4f3c65dc8ab5470a91a48f500982b7d10e