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

Merge branch 'maint-0.2.7' into maint-0.2.8
---

5222054163e0233dfc2cf59de779b2f816bfeb63