[tor-commits] [tor/master] Merge remote-tracking branch 'weasel/bug19505'

[nickm at torproject.org]

commit 560e976e4b3e330301704075bc6f9e1d5ccaa386
Merge: 2fb177e 135800f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 29 16:12:15 2016 -0400

    Merge remote-tracking branch 'weasel/bug19505'

 changes/bug19505      | 5 +++++
 doc/tor-gencert.1.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)