From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Nov 2016 01:10:40 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug20558'
X-Git-Tag: tor-0.3.0.1-alpha~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5d738e4819813569bcb768d176fc1e23a7c0a21;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug20558'
---

b5d738e4819813569bcb768d176fc1e23a7c0a21