commit 9ca9e6a1f7589f48b0165eed949ede90aa8e550f Merge: 8ddd84707 aa08c1970 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)