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

Merge branch 'maint-0.2.7'
---

62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c