commit 5b0ae084008eac13d051026c013862b239212807 parent d01abb9346bcb7b240b5277551ea75e85dfc160c Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 1 Mar 2018 16:43:10 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bump.