commit 1c248fa27d978a3a20f29ea76cc23c4c4604d1a0 Merge: de0969ef7 f56645917 Author: teor <teor at torproject.org> Date: Fri Mar 1 14:16:59 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5