commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2