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