commit 05ae99566549b57e7003e5c243f199f3aaa1f857 Merge: d0b75b5ad 562b3c967 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2