commit 767372f6a0829780f57096cfed9345f636becd37 Merge: 6e4967ef0 469189d84 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Sep 12 09:24:34 2017 -0400 Merge branch 'maint-0.3.1'