Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
commitd63c17f2afb810f5db896b10909fe9ff2bfe7cf9
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:22:29 +0000 (5 16:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:22:29 +0000 (5 16:22 -0400)
tree908e92f66bd6346f1830245920d0e4e8445b7d9a
parente51b57ee047420b929c7d58de70df6ea5ca77565
parentb05b165a75a9d9e912da64788fc873fb215f5d75
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
.travis.yml