Merge remote-tracking branch 'tor-github/pr/1076'
commit54eb3c043c1c7599a7cbd73321fba3476d49728b
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 19:35:43 +0000 (5 15:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 19:35:43 +0000 (5 15:35 -0400)
tree950f8158c5d95747da0c96097114465b3d26ac56
parent27e067df4fd3148b59dd0377d1a7b111460a2b53
parentc525135dac354892a45ad3d2f6de9450d393f09f
Merge remote-tracking branch 'tor-github/pr/1076'