[tor-commits] [tor/master] Merge branch 'bug20553_028'

[nickm at torproject.org]

commit 957bdc4a42eca62f0c2d687fe13db7de56c5cb7b
Merge: 1eef543 9b18b21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 3 10:52:21 2016 -0400

    Merge branch 'bug20553_028'

 changes/bug20553        | 3 +++
 src/common/crypto.c     | 5 ++---
 src/tools/tor-gencert.c | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)