From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Jul 2016 14:00:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'teor/bug19530-v2'
X-Git-Tag: tor-0.2.9.1-alpha~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0531d5155eddbbaca7c2a9d67e3954ee2599deb7;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/bug19530-v2'
---

0531d5155eddbbaca7c2a9d67e3954ee2599deb7