From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Dec 2016 23:19:41 +0000 (-0500)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.13~14^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d3d56e59a3df16615881007a77b77e30fecb831;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4' into maint-0.2.5

(ours merge -- there is a separate 0.2.5 patch for 20384.)
---

7d3d56e59a3df16615881007a77b77e30fecb831