Merge branch 'maint-0.4.0' into maint-0.4.1
commit4596ead2fc88e4b1482b0f3bc8ff356daea2337b
authorteor <teor@torproject.org>
Thu, 5 Sep 2019 04:48:02 +0000 (5 14:48 +1000)
committerteor <teor@torproject.org>
Thu, 5 Sep 2019 04:48:02 +0000 (5 14:48 +1000)
tree7fadec28fd1ad7aba2388d2d9e008500be567e1b
parent9dd908e7138ecc4c26c7db2f1c1be4776499237d
parent896a1ac50b6ab182c1e15cc5271d0b24fcb90a31
Merge branch 'maint-0.4.0' into maint-0.4.1