From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Nov 2015 16:40:58 +0000 (-0500)
Subject: Merge branch 'karsten_bug13192_026_03_teor'
X-Git-Tag: tor-0.2.8.1-alpha~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d20a3d07e3904d777b5395ad7e52930138634257;p=thirdparty%2Ftor.git

Merge branch 'karsten_bug13192_026_03_teor'
---

d20a3d07e3904d777b5395ad7e52930138634257
diff --cc src/test/test_util.c
index 0a5783e9f5,f96a362a6f..208186c7d5
--- 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),