From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Nov 2016 14:52:21 +0000 (-0400)
Subject: Merge branch 'bug20553_028'
X-Git-Tag: tor-0.3.0.1-alpha~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=957bdc4a42eca62f0c2d687fe13db7de56c5cb7b;p=thirdparty%2Ftor.git

Merge branch 'bug20553_028'
---

957bdc4a42eca62f0c2d687fe13db7de56c5cb7b