From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Dec 2015 15:11:54 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ec6757091434612c4f956b9ccdee6089f408564;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

0ec6757091434612c4f956b9ccdee6089f408564