[tor-commits] [tor/master] Merge branch 'bug28229_diag_035' into maint-0.3.5

[nickm at torproject.org]

commit 11a91ef728b18f86cee4a56b946d7c6f1f7958ba
Merge: e82023d2f 945c4dfda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Dec 1 11:20:04 2018 -0500

    Merge branch 'bug28229_diag_035' into maint-0.3.5

 changes/ticket28229_diag |  3 +++
 src/test/test_rebind.py  | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)