commit ba7d6a1e141b23f1963567b34eb2d8c33d652218 Merge: 2ee1a084f 751c71827 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.1'