[tor-commits] [tor/master] Merge branch 'feature17796_squashed'

[nickm at torproject.org]

commit 603110aa1db69ef0506ee94c3be80c59a664ee03
Merge: bc2cd0f a12c5f4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 29 09:48:39 2015 -0500

    Merge branch 'feature17796_squashed'

 changes/feature17796 |    6 +++++
 src/common/crypto.c  |   72 ++++++++++++++++++++++++++++++++++++--------------
 src/common/crypto.h  |    1 -
 3 files changed, 58 insertions(+), 21 deletions(-)