commit ba2be81fc36ba6140247873799b747605fb07bd4 Merge: cae59b9 c213f27 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 11 12:20:20 2016 -0500 Merge remote-tracking branch 'teor/feature17840-v11-merged-v2' changes/feature17840 | 9 + doc/tor.1.txt | 37 ++- src/common/address.c | 53 ++++ src/common/address.h | 21 ++ src/or/circuitbuild.c | 48 ++-- src/or/circuituse.c | 7 +- src/or/config.c | 30 +- src/or/connection.c | 74 ++++- src/or/connection.h | 6 +- src/or/control.c | 18 +- src/or/directory.c | 251 ++++++++++++---- src/or/directory.h | 4 +- src/or/entrynodes.c | 48 +++- src/or/nodelist.c | 307 +++++++++++++++----- src/or/nodelist.h | 12 +- src/or/or.h | 29 +- src/or/policies.c | 695 +++++++++++++++++++++++++++++++++++++++++++-- src/or/policies.h | 54 +++- src/or/rendclient.c | 12 +- src/or/router.c | 31 +- src/or/routerlist.c | 332 +++++++++++++++++----- src/or/routerlist.h | 5 +- src/test/test_entrynodes.c | 226 ++++++++++++++- src/test/test_policy.c | 536 ++++++++++++++++++++++++++++++++++ src/test/test_routerlist.c | 73 +++++ 25 files changed, 2595 insertions(+), 323 deletions(-)