commit 6520ef5478731ef9a2a38d274f0840d9c26598ba Merge: badc444 9b18b21 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 15:40:56 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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