From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 19 Oct 2015 15:20:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~295
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d939a83f5bc8ccf3760f61f25afb079097b47ea2;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.7'
---

d939a83f5bc8ccf3760f61f25afb079097b47ea2