commit 1b40e9986bba3667b8dd22af22c2e2f495c1eb6b Merge: c5ffcbb43 e8683bcbb Author: Nick Mathewson <nickm at torproject.org> Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.3'