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