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

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

75fe218b166b4d4e46b50205104e9eeaa136e904