commit 2446d4acc506842963a2b4d52ddcea95b5f6cccf parent 471e0096ad832ac8d6840254892bde96ea38df45 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 14 Sep 2017 13:22:04 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.