[tor-commits] [tor/master] Merge branch 'ticket29065_squashed'

[nickm at torproject.org]

commit 34601105a39236cf6b21c9fe2ba78733c7788ff3
Merge: f229a3368 b7dced893
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 24 17:02:35 2019 -0500

    Merge branch 'ticket29065_squashed'

 changes/ticket29065        | 3 +++
 src/test/test_switch_id.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)