From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Sep 2015 13:56:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'yawning/feature15482_fixup'
X-Git-Tag: tor-0.2.7.3-rc~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa89eb60e952b964147bddd8d40e503e6872a291;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/feature15482_fixup'
---

fa89eb60e952b964147bddd8d40e503e6872a291