commit f0bd6c2c9dbce3bff9ceea57f8d26e9807d7150d Merge: f27279f85 996f24fcd Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 13:14:37 2018 -0400

Merge branch 'maint-0.3.5'

changes/bug27968 | 3 +++ src/test/test_rebind.py | 61 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 47 insertions(+), 17 deletions(-)