[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/864'

[teor at torproject.org]

commit 583ed7c6ecde0c95184586d581f2cb1ac78e8c39
Merge: 9014add25 a7bc47532
Author: teor <teor at torproject.org>
Date:   Tue Apr 2 11:46:42 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/864'

 changes/bug29939           | 4 ++++
 src/test/test_routerkeys.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)