Merge branch 'maint-0.4.1' into release-0.4.1
commitb8628ac2a7f1676e7321fe742efbdf75d903700a
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 23:12:19 +0000 (17 19:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 23:12:19 +0000 (17 19:12 -0400)
tree80a0cd49f7727fdb2024fbe561e5d5acd03fa680
parentcda7f4d8bda7439cde68f8504f7d98002f907c07
parenta3342b382a1a87bbe41aa057761cd83daeadbfc7
Merge branch 'maint-0.4.1' into release-0.4.1