Merge remote-tracking branch 'teor/reject-tap-v6'
commitbbaa7d09a045130560a2f5da579671c5e02c9cd7
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Aug 2016 19:02:11 +0000 (29 15:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Aug 2016 19:02:11 +0000 (29 15:02 -0400)
tree232540453f40eb00b2dc0492b236967f383627e8
parentf46ce6e3d8bea3cf00388c87c29cdcafd4bab350
parent19816f2f782568722964d35ee132af441a809db3
Merge remote-tracking branch 'teor/reject-tap-v6'
13 files changed:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/circuitlist.c
src/or/config.c
src/or/networkstatus.c
src/or/nodelist.c
src/or/or.h
src/or/rendclient.c
src/or/rendservice.c
src/or/router.c
src/or/routerlist.c
src/or/routerlist.h
src/test/test_dir.c