Merge remote-tracking branch 'tor-github/pr/678'
commit0db0b4769c118ad8d77c8745877017144bc5805a
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:30:27 +0000 (19 11:30 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:30:27 +0000 (19 11:30 -0500)
treeb2ead27fedc19bd5ec5ac3173cc7db2da39bb602
parent8a5c66cbb0adf1ef63f1c5f1048dfbc4c6f7267d
parent0b245e418e91cbbc325dfdc399fc184b067e9471
Merge remote-tracking branch 'tor-github/pr/678'