From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 25 Aug 2013 04:34:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2452302354fdd6d34e1637380ffc73af067fd904;p=thirdparty%2Ftor.git

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

2452302354fdd6d34e1637380ffc73af067fd904