commit b98c5884fc28c4c2b4871d00bd6eeb78fadab3f3 Merge: 85284c3 129f26e Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 20 11:40:21 2013 -0500

Merge remote-tracking branch 'linus/bug10324'

changes/bug10324 | 2 ++ src/tools/tor-gencert.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)