Merge branch 'maint-0.4.1' into release-0.4.1
commit6c3f339f05b8839a1a8a9c8a5af3e2ec9db6ab53
authorteor <teor@torproject.org>
Thu, 5 Sep 2019 04:48:05 +0000 (5 14:48 +1000)
committerteor <teor@torproject.org>
Thu, 5 Sep 2019 04:48:05 +0000 (5 14:48 +1000)
tree3b977a535a03f7e8978012553a50cf1ba2f7174e
parent215c3eef81466415d40f5224ed02db4ca7d1b454
parent4596ead2fc88e4b1482b0f3bc8ff356daea2337b
Merge branch 'maint-0.4.1' into release-0.4.1