From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Mar 2016 15:36:35 +0000 (-0500)
Subject: Merge branch 'maint-0.2.5' into maint-0.2.6
X-Git-Tag: tor-0.2.6.11~22^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=443dddb74966eea0b30231b9f18b80b9372f2210;p=thirdparty%2Ftor.git

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

443dddb74966eea0b30231b9f18b80b9372f2210