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

[nickm at torproject.org]

commit ac707ae70a100ab838c4b65f31cbf130b4bef583
Merge: af70e43 cff1274
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 14 10:23:24 2016 -0400

    Merge branch 'bug20176_v2'

 src/or/networkstatus.c | 61 ++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)