From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Sep 2016 12:54:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/ticket19998'
X-Git-Tag: tor-0.2.9.3-alpha~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b182dfc237ba4457b654a0dbc124f721024dab2;p=thirdparty%2Ftor.git

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

4b182dfc237ba4457b654a0dbc124f721024dab2