commit a0ab950bfab07f9d3a114d59d45c0ab1db291fe8 Merge: 5ac0e9113 a3fc93b8d Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 2 09:05:18 2018 -0400 Merge branch 'maint-0.3.5'