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

[nickm at torproject.org]

commit 72f06fc59c5c5dd30a46e2c6fae9cdb551298dee
Merge: 7ebec27 66c85cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:56:31 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22838_028      | 5 +++++
 src/test/test_switch_id.c | 1 +
 2 files changed, 6 insertions(+)