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

[nickm at torproject.org]

commit d567796946506672376ceda86789b2bcb0a25ad0
Merge: 34d429f a874d66
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 11:21:31 2016 -0400

    Merge remote-tracking branch 'public/bug17443_v2'

 changes/bug17443        | 5 +++++
 src/tools/tor-gencert.c | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)