Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
commite51b57ee047420b929c7d58de70df6ea5ca77565
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:16:34 +0000 (5 16:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:16:34 +0000 (5 16:16 -0400)
treef332604172071b6f4af9643cef8645101b59b75b
parent04cb2d4010f131c970d0cf3ba56c9d752b8facb9
parent802ac8ad618a0674c26bb973a2277e07b20f8c7b
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0