From: Roger Dingledine <arma@torproject.org>
Date: Mon, 13 Feb 2017 20:39:13 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7' into maint-0.2.8
X-Git-Tag: tor-0.2.8.13~7^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ff76185d284f1982b5f49b2c652f7a05e71ba2b;p=thirdparty%2Ftor.git

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

9ff76185d284f1982b5f49b2c652f7a05e71ba2b