commit d20a3d07e3904d777b5395ad7e52930138634257 Merge: 0a3eed5 1f7ba11 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 12 11:40:58 2015 -0500

Merge branch 'karsten_bug13192_026_03_teor'

changes/laplace-edge-cases | 8 +++ src/common/util.c | 102 +++++++++++++++++++++------ src/common/util.h | 1 + src/or/rephist.c | 12 ++-- src/test/test_util.c | 165 +++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 260 insertions(+), 28 deletions(-)

diff --cc src/test/test_util.c index 0a5783e,f96a362..208186c --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -4438,9 -4488,9 +4600,10 @@@ struct testcase_t util_tests[] = UTIL_LEGACY(path_is_relative), UTIL_LEGACY(strtok), UTIL_LEGACY(di_ops), + UTIL_TEST(di_map, 0), UTIL_TEST(round_to_next_multiple_of, 0), UTIL_TEST(laplace, 0), + UTIL_TEST(clamp_double_to_int64, 0), UTIL_TEST(find_str_at_start_of_line, 0), UTIL_TEST(string_is_C_identifier, 0), UTIL_TEST(asprintf, 0),