commit 6f2657dbcf81c8f78acb49d487075e66ec9be3c2 parent a53573559fc97b0931ec67a0ad27b796c305ff06 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 29 Jun 2017 18:44:53 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.