Merge remote-tracking branch 'tor-github/pr/385'
commit7409aa58d18f23d17b03898a4e2b06fba7c2e102
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Oct 2018 16:46:46 +0000 (9 12:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Oct 2018 16:46:46 +0000 (9 12:46 -0400)
tree9741ddc3d2ceaea87411bb9766721222613c237d
parent361eaa9931f8043b049a0bb8b943d0c6422f5aa0
parent3cc089ce594bac1b7a3a88f10de7f00adc1f20c9
Merge remote-tracking branch 'tor-github/pr/385'