From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Dec 2015 13:45:09 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1321608786c452ab9f0bf19f37509938f7755117;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

1321608786c452ab9f0bf19f37509938f7755117