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

[nickm at torproject.org]

commit 1c47459e5a5ed6d404a8034502543e7e4a67be38
Merge: ed0bc85ed b7018b1a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 19 15:36:08 2018 -0500

    Merge branch 'maint-0.3.5'

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