From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 21 Oct 2015 14:56:40 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35edd74e25cb077a89a9d6c14e542d1d1ffc7c8e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.7'
---

35edd74e25cb077a89a9d6c14e542d1d1ffc7c8e