From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Apr 2015 18:18:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=028cac97c1953f666c89711e31754cec4273b2d0;p=thirdparty%2Ftor.git

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

028cac97c1953f666c89711e31754cec4273b2d0