commit 9c89e8e4354283e4596e82adb876653d4c95ac6c parent fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 30 Nov 2017 12:25:53 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bumps
