[tor-commits] [tor/master] Merge branch 'pr278_squashed'

[nickm at torproject.org]

commit 62743912bcbacc1bd918b60a80f3394647d2ef91
Merge: 0dbd4fe30 7b27d98ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 12 09:06:35 2018 -0400

    Merge branch 'pr278_squashed'

 changes/bug17873               |   6 +
 src/app/config/config.c        |  16 +--
 src/core/mainloop/connection.c | 247 ++++++++++++++++++++++++++++++-----------
 src/core/mainloop/connection.h |  14 ++-
 src/core/mainloop/main.c       |   2 +-
 src/test/include.am            |   3 +
 src/test/test_rebind.py        |  89 +++++++++++++++
 src/test/test_rebind.sh        |  19 ++++
 8 files changed, 314 insertions(+), 82 deletions(-)