From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 May 2016 22:14:27 +0000 (-0400)
Subject: Merge branch 'bug19008_027' into maint-0.2.7
X-Git-Tag: tor-0.2.8.3-alpha~35^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61c0bae4f20556cf155562582ea00a6a147252d6;p=thirdparty%2Ftor.git

Merge branch 'bug19008_027' into maint-0.2.7
---

61c0bae4f20556cf155562582ea00a6a147252d6