Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
commit593d29920e264180a7a6849fc59224a8869388d7
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Apr 2019 14:15:03 +0000 (29 10:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Apr 2019 14:15:03 +0000 (29 10:15 -0400)
treedb56e8671bc79f54064d5e3ee5b8cbcf25fb2d44
parenta39789a02c2d89eaa8289a68a6b0fab0cc4d71dc
parent1788343affdec7ac73dbdf1c50b486f593a2d428
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0