commit 6004dd2162633d3af526c5e3cc7dda9326e1c95e Merge: a783c5c 16b64fc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 15 11:01:26 2017 -0400 Merge branch 'deprecate_getinfo_network_status' changes/bug21703 | 4 ++++ src/or/control.c | 6 ++++++ src/or/dirserv.c | 6 ++++++ 3 files changed, 16 insertions(+)