[tor-commits] [tor/master] Merge remote-tracking branch 'chelseakomlo/20717_hashing_api_bug'

commit f92630941ab8f6d79d23acc921eb780202b65e3b Merge: 3f295bb 1ca7774 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 5 10:27:16 2016 -0500

Merge remote-tracking branch 'chelseakomlo/20717_hashing_api_bug'

changes/ticket20717 | 4 ++++ src/common/crypto.c | 40 +++++++++++++++++++++++++++------------- src/or/rendservice.c | 2 +- src/or/routerparse.c | 4 ++-- src/or/shared_random.c | 6 +++--- 5 files changed, 37 insertions(+), 19 deletions(-)