[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug26036'

[nickm at torproject.org]

commit 5ad72bc1f50253c7d080e5d1f8f254f01bb1f19b
Merge: 17236a584 9326abe16
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 7 14:38:26 2018 -0400

    Merge remote-tracking branch 'catalyst-github/bug26036'

 src/common/crypto.c      | 6 ------
 src/common/crypto_rand.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)