commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor teor@torproject.org Date: Tue Jun 11 14:46:24 2019 +1000

Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-)