commit 1494fa0d3b2a3902d0555bc5cc557b88c6130f48 parent 1712dc98b04ef7b84df67e02da21ea1aa70bc74c Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 29 Jun 2017 16:36:05 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.