From: Roger Dingledine <arma@torproject.org>
Date: Mon, 13 Feb 2017 20:27:57 +0000 (-0500)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.6
X-Git-Tag: tor-0.2.6.11~6^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e778a411b9e75ad2c1b46a6624d586a6f4a0c554;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5' into maint-0.2.6
---

e778a411b9e75ad2c1b46a6624d586a6f4a0c554