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

[nickm at torproject.org]

commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c
Merge: 4858cda 48e45e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:56:31 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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