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

[nickm at torproject.org]

commit 48e45e2fb1efa37dd08373e969d339c785585a7d
Merge: c1e4aff ae756f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:55:51 2017 -0400

    Merge branch 'bug22838_028' into maint-0.2.8

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