From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Dec 2015 14:24:40 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437