Merge remote-tracking branch 'twstrike/tortls_tests'

diff --cc src/common/tortls.c
Simple merge

diff --cc src/test/include.am
index a9d8b652b2a7e2618e94521a266cb44b8af8cfeb,a2be1ff2f19780bc39c85ed7201c53c8d123187d..5a5f63a34192ca24f0e9cde5a62e1ed11a3d5217
--- 1/src/test/include.am
--- 2/src/test/include.am
+++ b/src/test/include.am
@@@ -95,8 -96,8 +95,9 @@@ src_test_test_SOURCES = 
        src/test/test_socks.c \
        src/test/test_status.c \
        src/test/test_threads.c \
+       src/test/test_tortls.c \
        src/test/test_util.c \
 +      src/test/test_util_format.c \
        src/test/test_helpers.c \
          src/test/test_dns.c \
        src/test/testing_common.c \

diff --cc src/test/test.c
index 1ab94fd9b4eba54c2e843218c5383224143588f1,3509c1278878a30b196e62f048efeb7e36e557af..26c27a8ea53f956fb4f7cc81f8823e612b776a9a
--- 1/src/test/test.c
--- 2/src/test/test.c
+++ b/src/test/test.c
@@@ -1162,8 -1157,8 +1162,9 @@@ extern struct testcase_t scheduler_test
  extern struct testcase_t socks_tests[];
  extern struct testcase_t status_tests[];
  extern struct testcase_t thread_tests[];
+ extern struct testcase_t tortls_tests[];
  extern struct testcase_t util_tests[];
 +extern struct testcase_t util_format_tests[];
  extern struct testcase_t dns_tests[];
  
  struct testgroup_t testgroups[] = {
@@@ -1209,8 -1203,8 +1210,9 @@@
    { "scheduler/", scheduler_tests },
    { "socks/", socks_tests },
    { "status/" , status_tests },
+   { "tortls/", tortls_tests },
    { "util/", util_tests },
 +  { "util/format/", util_format_tests },
    { "util/logging/", logging_tests },
    { "util/thread/", thread_tests },
    { "dns/", dns_tests },