From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Feb 2015 16:54:16 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a17c541b7a217ca5580fc01d35d2d0d620a31d1;p=thirdparty%2Ftor.git

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

4a17c541b7a217ca5580fc01d35d2d0d620a31d1