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

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

a87f22ef6499818c1ff32f30c66e2e18d1e80ddf