commit eb7f55df88cb5a298efef6b9ef9b8bf6c7ad6338 Merge: 252960f2e dcb8cad4e Author: teor teor@torproject.org Date: Tue Jun 11 14:52:23 2019 +1000
Merge branch 'maint-0.3.5' into release-0.3.5
.travis.yml | 29 ++++++++--------------------- changes/bug30713 | 5 +++++ changes/bug30744 | 3 +++ changes/ticket29702 | 4 ++++ changes/ticket30213 | 3 +++ changes/ticket30234 | 2 ++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 17 ++++++++++++++++- src/test/test_rebind.sh | 4 ++-- src/test/zero_length_keys.sh | 3 ++- 11 files changed, 49 insertions(+), 27 deletions(-)