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

[nickm at torproject.org]

commit 0633d14b470c0dba6b980879f8362c9aee4f4fe9
Merge: a49521b 8f5da80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 10 16:26:53 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/prop275-minimal | 9 +++++++++
 src/or/networkstatus.c  | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)