From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Dec 2015 15:31:14 +0000 (-0500)
Subject: Merge branch 'bug17776'
X-Git-Tag: tor-0.2.8.1-alpha~177
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f48e1d686415c89688ecfb0ec9fe3e0e554ca3f;p=thirdparty%2Ftor.git

Merge branch 'bug17776'
---

8f48e1d686415c89688ecfb0ec9fe3e0e554ca3f