commit cce936aee07271717440f5538cbebf4fafb9e420 Merge: 91467e04b 9b0264181 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.1'