From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 Dec 2015 15:05:29 +0000 (-0500)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e0da695e0f0485da1c91c1dd7a4919b273acf01;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

7e0da695e0f0485da1c91c1dd7a4919b273acf01