commit b7018b1a24fbdaed2805e11b0343e03445f8cb7e Merge: 26bbeb298 315c21d2e Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 19 15:36:03 2018 -0500

Merge branch 'ticket28883_035' into maint-0.3.5

changes/ticket28883 | 4 ++++ src/test/test_rebind.py | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-)