commit 066d257674524bd1ab97cdea9a1c32beabfd527c Merge: e47f23ba5 c0e18d2f8 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.5'