commit 1bd562f1c4c165d0c8f60c8ed61122e7e247f86a Merge: b659ffe d5df9fa Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 12 09:50:31 2016 -0500

Merge branch 'people-to-node-type'

src/or/circuitbuild.c | 2 +- src/or/circuitstats.c | 2 +- src/or/circuituse.c | 2 +- src/or/config.c | 2 +- src/or/connection_edge.c | 2 +- src/or/dirserv.c | 6 +++--- src/or/dnsserv.c | 2 +- src/or/hibernate.c | 6 +++--- src/or/or.h | 2 +- src/or/router.c | 6 +++--- src/or/routerlist.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-)