commit 94cab0d0bb3cce4a3f7f27cc169e5e5c1cb5c830 Merge: 98a1b8770 fa05efdf8 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 14:36:02 2019 -0500 Merge branch 'maint-0.3.5'