commit c292e505ff46a41f5f966556e9f4588385816c77 Merge: fc1ad9ab6 997a8b0ca Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 26 17:22:37 2018 -0500

Merge remote-tracking branch 'tor-github/pr/539'

src/test/test_rebind.py | 10 +++++++--- src/test/test_rebind.sh | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-)