From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Jun 2014 01:09:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.5-alpha~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=173a1afc5819f1fcabfa34bab5714d61088cc29f;p=thirdparty%2Ftor.git

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

173a1afc5819f1fcabfa34bab5714d61088cc29f