From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Jan 2017 17:59:39 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/ticket20921'
X-Git-Tag: tor-0.3.0.2-alpha~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=111c66b2f0f58206026ca6a72852c3afcb56b9e7;p=thirdparty%2Ftor.git

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

111c66b2f0f58206026ca6a72852c3afcb56b9e7