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

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

ab3826f8333cec974c4b020ef30acda678ebe318