Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
commit530304dd773b178c7cc0c5db26e53ec196219191
authorteor <teor@torproject.org>
Wed, 13 Mar 2019 20:36:47 +0000 (14 06:36 +1000)
committerteor <teor@torproject.org>
Wed, 13 Mar 2019 20:36:47 +0000 (14 06:36 +1000)
treed3ef7f9f8e58622fd0d0957f8f3aa73d7ac73f3a
parenteaa84234c97e54d2626239152a35bcd633c10107
parente8d84b18aabf6a3d32a41700142048224e83ed8b
Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9