From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Feb 2016 19:05:54 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.2-alpha~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7f303a4818b551b4a59a3624cc337294a2703e3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

a7f303a4818b551b4a59a3624cc337294a2703e3