Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3

changes/bug40179_part2

+  o Minor bugfixes (testing):
+    - Fix the config/parse_tcp_proxy_line test so that it works correctly on
+      systems where the DNS provider hijacks invalid queries.
+      Fixes part of bug 40179; bugfix on 0.4.3.1-alpha.

src/test/test_config.c

@@ -703,11 +703,13 @@ test_config_parse_tcp_proxy_line(void *arg)
   tor_free(msg);
 
   /* Bad TCPProxy line - unparsable address/port. */
-  ret = parse_tcp_proxy_line("haproxy 95.216.163.36/443", options, &msg);
+  MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs);
+  ret = parse_tcp_proxy_line("haproxy bogus_address!/300", options, &msg);
   tt_int_op(ret, OP_EQ, -1);
   tt_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. "
                         "Please fix.");
   tor_free(msg);
+  UNMOCK(tor_addr_lookup);
 
   /* Good TCPProxy line - ipv4. */
   ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg);
@@ -720,7 +722,7 @@ test_config_parse_tcp_proxy_line(void *arg)
   tor_free(msg);
 
  done:
-  ;
+  UNMOCK(tor_addr_lookup);
 }
 
 /**