From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Feb 2017 13:39:25 +0000 (-0500)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.13~14^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb72365554451f5e129169bb1216a9610f7ff183;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.6' into maint-0.2.7
---

eb72365554451f5e129169bb1216a9610f7ff183