From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Mar 2015 14:19:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ced3b59aad0fffd653869d486bb0f4b1c26b19f;p=thirdparty%2Ftor.git

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

4ced3b59aad0fffd653869d486bb0f4b1c26b19f