Merge branch 'maint-0.4.3' into release-0.4.3

This commit is contained in:
teor
2020-04-04 13:23:52 +10:00
2 changed files with 8 additions and 1 deletions
+7
View File
@@ -0,0 +1,7 @@
o Testing:
- Avoid conflicts between the fake sockets in tor's unit tests, and real
file descriptors. Resolves issues running unit tests with GitHub Actions,
where the process that embeds or launches the tests has already opened a
large number of file descriptors.
Fixes bug 33782; bugfix on 0.2.8.1-alpha.
Found and fixed by Putta Khunchalee.
+1 -1
View File
@@ -10,7 +10,7 @@
#define TEST_CONN_ADDRESS_2 "127.0.0.2"
#define TEST_CONN_PORT (12345)
#define TEST_CONN_ADDRESS_PORT "127.0.0.1:12345"
#define TEST_CONN_FD_INIT 50
#define TEST_CONN_FD_INIT 0x10000
void test_conn_lookup_addr_helper(const char *address,
int family, tor_addr_t *addr);