From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Feb 2017 12:52:41 +0000 (-0500)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.13~7^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaint-0.2.7;p=thirdparty%2Ftor.git

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

e6376a8004072fde832da77aa6369075dcdcbe8b