commit 021c3bd5879f1f3d25823a63c86b159dfb29a434 Merge: 98fc8cd93 91109bc81 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2