commit 0fe3b373acfff401059bcbf13ed1503aa19d0c69 Merge: 463ded569 430dd2da6 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 10 18:33:26 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

.travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-)