commit c875265bbbddc50674f65169ee49d5612bef72a7 Merge: e14f9dd b1b8f79 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 25 22:28:12 2015 -0500

Merge remote-tracking branch 'teor/check-crypto-errors-v2'

changes/check-crypto-errors | 5 +++++ src/common/crypto.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)