commit da179088ee1e687d154e60342cefb6c6080fcc15 Merge: 7037fe116 8df6a65e6 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 20 12:09:02 2019 -0500

Merge branch 'tor-github/pr/687'

changes/ticket29068 | 2 ++ src/test/zero_length_keys.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)