commit 1a497dcd1e43913042ed5b11d4c9466ea1956399 Merge: ee3ccd2 a868b84 Author: Nick Mathewson nickm@torproject.org Date: Wed May 10 16:28:07 2017 -0400

Merge branch 'maint-0.3.0'

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