commit d612f7d9508e4233c9e49c077f27b0393a00508e Merge: 066d25767 8af8ecabb Author: Nick Mathewson <nickm at torproject.org> Date: Thu Nov 15 16:56:11 2018 -0500 Merge branch 'maint-0.3.5'