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

Merge branch 'maint-0.2.5' into maint-0.2.6

("ours" merge because there is a separate 20384 patch for 026)
---

746c51b6132d84fc7899e6b95b4a1666717d8cce