commit 99056595735ff7fcfc4012c009381d69ae6b4afc Merge: 6390a0c 8f1ddf0 Author: Nick Mathewson nickm@torproject.org Date: Thu May 11 09:20:12 2017 -0400

Merge remote-tracking branch 'arma/cleanup22213'

changes/cleanup22213 | 4 ++++ src/or/directory.c | 9 +-------- src/or/or.h | 2 -- src/or/routerlist.h | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-)