From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 Dec 2015 19:25:14 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d015c70a118e43577a3821433970c4367cc8982f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

d015c70a118e43577a3821433970c4367cc8982f