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

Merge branch 'maint-0.2.6' into maint-0.2.7
---

d920cbb82c2203b328d66d6c9d8f28fd35608560