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

[nickm at torproject.org]

commit 8f5da804da5a8cd486478f8bf2fea1f47a025225
Merge: 0df22e8 85cf6dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 10 16:26:45 2017 -0400

    Merge branch 'prop275_minimal_029' into maint-0.2.9

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