From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 5 Feb 2016 13:13:24 +0000 (-0500)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.6
X-Git-Tag: tor-0.2.6.11~22^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44ad3be221fb8e5e648c6d56054fb1d8596a645b;p=thirdparty%2Ftor.git

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

44ad3be221fb8e5e648c6d56054fb1d8596a645b