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

[nickm at torproject.org]

commit 5c64d56a4144d6642288a224a4dcbd06f30ec03a
Merge: 8f6e897 48e45e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:55:57 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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