commit 2ac24b503b77dfc9aa414902b6b00221339abaf6 Merge: 084a5a13c a6c7e0158 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 2 09:39:16 2018 -0400 Merge branch 'maint-0.3.5'