commit a2e034d7d9b86bafe78ae8ede86ccc8ce040f7e7 Merge: 2a4506776 0d124488f Author: Nick Mathewson <nickm at torproject.org> Date: Wed Oct 31 11:02:58 2018 -0400 Merge branch 'maint-0.3.5'