From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 11 Aug 2018 14:04:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/268'
X-Git-Tag: tor-0.3.5.1-alpha~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61d5bcc1a251002d726e66461ec576d9b71cebd1;p=thirdparty%2Ftor.git

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

61d5bcc1a251002d726e66461ec576d9b71cebd1