Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
commit8803930de8c5845fdb56614fbec32604ad64bf6d
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Jun 2019 17:36:10 +0000 (24 13:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Jun 2019 17:36:10 +0000 (24 13:36 -0400)
tree6c3bee8f6ecef95f3d58f3b414a35cb926c47942
parentaab5f42ae01cb33ec32ff02f1468bb0360d341e0
parent8356cc5b514a5d6a0170927d7c3730e2e1164298
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1