[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3
Merge: 6361a250f bca8a104b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 08:00:35 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26062    | 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)