commit 2074984c34d346dec04614e2609c7694f8aa8aa7 Merge: e2ddc8b54 9b0264181 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1