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

[nickm at torproject.org]

commit 66c85cd8812c7d862edafc03b8e04bf3555733a3
Merge: 2dd1e21 ed0fb21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:56:31 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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