commit a0033c8552946f3114693f7dc08c8cf02e9636b8 Merge: ad1ffb6b2 ef2925e74 Author: teor <teor at torproject.org> Date: Wed Feb 27 09:38:26 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0