commit 6758549fe89e7f8fe288158f3f1e1cbe1d3be1f2 Merge: 7372315 a868b84 Author: Nick Mathewson nickm@torproject.org Date: Wed May 10 16:27:22 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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