commit 6267ea5fbe7c6f07f06a0877d61026b0840e7a39 Merge: 8954cbfcf 11a91ef72 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Dec 1 11:20:10 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket28229_diag | 3 +++ src/test/test_rebind.py | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)