commit 996f24fcd31be197b8cfc9cb5dddd2b04a4cf3a2 Merge: 0ea508ec6 e36e4a967 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 13:14:32 2018 -0400

Merge branch 'bug27968_squashed' into maint-0.3.5

changes/bug27968 | 3 +++ src/test/test_rebind.py | 61 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 47 insertions(+), 17 deletions(-)