commit adb7b92ca33e20fc40531ddcfe8360d333ba639d Merge: af5454e01 9120ac221 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 23 08:47:59 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1