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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into release-0.2.9

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