From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 13 Jun 2016 14:48:56 +0000 (-0400)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.8.4-rc~6^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80089c9e7c16f38e398e99cbc773c3182cee9229;p=thirdparty%2Ftor.git

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

80089c9e7c16f38e398e99cbc773c3182cee9229