commit 4c81ab5914c9ffa65bbc2668550a39164fd89284 Merge: df70bc3a8 db9ab3754 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 5 08:13:02 2018 -0500

Merge remote-tracking branch 'tor-github/pr/560'

src/core/mainloop/connection.c | 22 +++++++++++++++++++++- src/test/test_rebind.py | 5 +++-- 2 files changed, 24 insertions(+), 3 deletions(-)