commit d67c66536c90e32d779c53444f6668d9c5be4a3f Merge: 3cf8aac ed0fb21 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 7 10:56:31 2017 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)