commit c57a119eb886d705bc2a067635ca7ef8bc74f1de parent 6b2c88649ddb9496d6ae738d2c08436304fed0ea Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 28 Jun 2017 13:54:00 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid taking redundant ws fix