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

Merge branch 'maint-0.2.7'
---

fec5aa75f4c50f6b307edbc7662bdb9c5a73f617