commit 3463b4e0652bacca51fecd2c256e3e9d61ce920e Merge: 197d1992d 22845df2a Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 16 10:06:21 2018 -0400

Merge branch 'maint-0.3.3'

changes/bug25226 | 4 +++ src/or/networkstatus.c | 1 + src/or/or.h | 6 ----- src/or/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++--- src/or/relay.h | 1 + 5 files changed, 70 insertions(+), 9 deletions(-)