commit 7f98df0731314f4a3d5dd82fc3f1db3f13dacf9c Merge: 78a747944 1a9a9fc0f Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 17 10:57:51 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug28562 | 5 +++++ src/test/test_rebind.py | 10 +++++++--- src/test/test_rebind.sh | 15 ++++++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-)