commit feb7253df316ee1ec9c2ec3e33aac312da4d1f02 Merge: ec2a2a6b7 5d41e2223 Author: teor <teor at torproject.org> Date: Thu Mar 14 07:00:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0