commit 6b2c88649ddb9496d6ae738d2c08436304fed0ea parent c239b2fc9c19d7c146888b534a8b51a88df03326 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 28 Jun 2017 13:49:14 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours" merge to avoid taking backport of 21969
