commit 91f72bbb6c2ef97836393144f9cd095a71c5f008 Merge: aa6212a85 9acfd70f2 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 6 14:37:15 2017 -0500

Merge remote-tracking branch 'teor/bug24489'

changes/bug24489 | 3 +++ src/or/networkstatus.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)