[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket26062_034_01'

[nickm at torproject.org]

commit a4a7939ae1605936c55d4b483d5f01e947f7575c
Merge: bbee2b62c 67a41b630
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 08:04:03 2018 -0400

    Merge remote-tracking branch 'dgoulet/ticket26062_034_01'

 changes/ticket26062    |  4 ++++
 src/or/config.c        | 14 ++++++++++++++
 src/or/config.h        |  3 +++
 src/or/main.c          |  2 +-
 src/or/networkstatus.c | 20 +-------------------
 src/or/networkstatus.h |  2 --
 6 files changed, 23 insertions(+), 22 deletions(-)