commit 4593f5a6e12132be4ac97d7a93675d1a04fa4b29 Merge: 43fb8fc5c cdee62da9 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2