From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 May 2016 18:59:18 +0000 (-0400)
Subject: Merge branch 'maint-0.2.7' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55cf1970bce222a32c387652fe5080adb2aa1513;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7' into maint-0.2.8
---

55cf1970bce222a32c387652fe5080adb2aa1513