From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Nov 2015 15:28:43 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a41d2a1d9eb65268d0f36e39d0ade77f5a39307;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

8a41d2a1d9eb65268d0f36e39d0ade77f5a39307