Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
commitc0285320df4e52530129ca515de08245d035c889
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2019 22:31:23 +0000 (10 18:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2019 22:31:23 +0000 (10 18:31 -0400)
treea70be874c3b3ec3448e76f9e69fe06d0a7cb5866
parent765e4364d97cea17affef7413cda5fa02eb8f347
parentb9041e8a631beda9762fcd0627fa91045086410d
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1