commit 5ec566edda60f0c9deec366f51c3956cbd5c2d49 Merge: 8e1e71cc0 f9050681c Author: Nick Mathewson <nickm at torproject.org> Date: Wed Jan 23 09:51:32 2019 -0500 Merge branch 'maint-0.3.5'