From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 28 Feb 2017 15:22:36 +0000 (-0500)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2b604ecb4df95526a309c9ff507dff942472daa;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid bumping version
---

b2b604ecb4df95526a309c9ff507dff942472daa