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

commit 22e6880296185f2ed12755290f73dc30b3dc5510 Merge: e5e2df36f 408ed52e3 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 8 08:06:44 2017 -0400 Merge branch 'ticket22377' changes/ticket22377 | 4 ++++ src/or/control.c | 47 ++++------------------------------------------- src/or/control.h | 9 ++------- src/or/dirserv.c | 12 ------------ 4 files changed, 10 insertions(+), 62 deletions(-)