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

Merge branch 'maint-0.2.7'
---

252149e8b4697c570097acd514c433b8215f24dd