commit 75edf0348e74fa07336460249ef43bac034659a6 Merge: 7c70d5a1b 5d41e2223 Author: teor <teor at torproject.org> Date: Thu Mar 14 07:00:38 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5