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

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

beec881f92d25b4e85aa30be341d30fce54b2e50