[tor-commits] [tor/master] Merge branch 'maint-0.4.4' into master

[asn at torproject.org]

commit 84e825598a8845b34ac0dff2a6d797725c174b19
Merge: 5f61e19d8a 149b7a2418
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Oct 7 13:29:16 2020 +0300

    Merge branch 'maint-0.4.4' into master

 changes/bug40113           |  3 +++
 src/test/test_connection.c | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --cc src/test/test_connection.c
index 954aeb82e3,b1252864f5..178a37adf6
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@@ -1103,8 -996,7 +1104,8 @@@ struct testcase_t connection_tests[] = 
    CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK,
                            test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG),
  
- //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair),
+   //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair),
    { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL },
 +  { "describe", test_conn_describe, TT_FORK, NULL, NULL },
    END_OF_TESTCASES
  };