[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit 3bb49c011006d042f8a3f802d7abb3e9da51b15b
Merge: ff3e08f 9b18b21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 3 15:41:04 2016 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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