From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 17:15:17 +0000 (-0400)
Subject: Merge branch 'maint-0.2.7' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24fbb9a81b19cc20df9a204d3203d1b914fb267d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7' into maint-0.2.8
---

24fbb9a81b19cc20df9a204d3203d1b914fb267d