From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Jan 2016 16:53:03 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5bed4dab2f8521f744d5137e4f439b073c7e5e9;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

a5bed4dab2f8521f744d5137e4f439b073c7e5e9