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

[nickm at torproject.org]

commit 01adeb2471360f4c832252d8b9b9a05ab212a76c
Merge: d8c1c70d7 81aec1449
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 16 13:31:29 2018 -0500

    Merge branch 'stack_em_up'

 src/or/networkstatus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)