commit 5ac0e9113b5571772a95e09887b3da8d02c1b4b7 Merge: a0402c6f3 d409565e3 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 2 09:04:25 2018 -0400 Merge branch 'maint-0.3.5'