commit 773ae169eb5e20a29f41e839709230dec424ef89 Merge: f46fcb6d3 1b4075cb2 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 15 17:08:34 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5