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

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

f7986269c32b94929a705a8f125b353e505a488c