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

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

cd14405a431cf351abe79441214899cfee5eb670