commit 7e4ac0283ef9c089ebe4da8b85a5f6b5ec84a081 Merge: 01c73711f 9118430b1 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 08:50:38 2018 -0400

Merge remote-tracking branch 'teor/bug26986'

changes/bug26986 | 3 +++ src/lib/cc/torint.h | 10 ++++++++++ src/tools/tor-print-ed-signing-cert.c | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-)