commit a15009bd38cfc7ef9a426c25d40d2c7a8c6a2a80 Merge: 7e1102ff2 e5acbbd16 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 10 08:20:38 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)