Merge branch 'maint-0.4.0'
commit17e29bda5d4e39e4cb84fa0ad0b011f576b6b6c6
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:34:25 +0000 (19 11:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:34:25 +0000 (19 11:34 -0500)
tree69a6c6c8d7a14d6e7ebab4d9a0b8f77757eb2ee5
parentaf36af1a9b857772fb6dac2b413850ce8e02bdee
parentb5f3a3d6a76ffd7727833c2b1901629c9f23a99d
Merge branch 'maint-0.4.0'