commit bc6f14913340bee158932488492e1d729add145b Merge: 6d375e1cb b7018b1a2 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 19 15:36:08 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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