commit 15900ab70fe2dc4d40f974ba49ba35421e7fcf1f Merge: 938d97cb0 572916025 Author: teor teor@torproject.org Date: Fri Mar 22 13:10:47 2019 +1000

Merge remote-tracking branch 'tor-github/pr/819'

changes/bug28636 | 8 ++ src/core/or/circuit_st.h | 8 +- src/core/or/circuitpadding.c | 82 +++++++++------- src/core/or/circuitpadding.h | 44 ++++----- src/feature/hibernate/hibernate.h | 1 + src/lib/crypt_ops/crypto_rand.h | 3 + src/lib/crypt_ops/crypto_rand_numeric.c | 30 +++++- src/lib/math/prob_distr.c | 165 +++++++++++++------------------- src/test/test_circuitpadding.c | 29 +++--- 9 files changed, 198 insertions(+), 172 deletions(-)