From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Sep 2018 12:12:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/318'
X-Git-Tag: tor-0.3.5.1-alpha~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8294c40c96a9ec59ff3e0a3ce2f4926c275ab114;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/318'
---

8294c40c96a9ec59ff3e0a3ce2f4926c275ab114