[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20558'

[nickm at torproject.org]

commit b5d738e4819813569bcb768d176fc1e23a7c0a21
Merge: a742637 00bdd56
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 17 20:10:40 2016 -0500

    Merge remote-tracking branch 'public/bug20558'

 src/or/torcert.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)