nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3'

Browse Source
This commit is contained in:
teor 2020-04-04 13:23:56 +10:00
commit a84fd949ed
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug33782 Normal file
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.

2
src/test/test_connection.h
View File

@ -10,7 +10,7 @@
#define TEST_CONN_ADDRESS_2 "127.0.0.2" #define TEST_CONN_ADDRESS_2 "127.0.0.2"
#define TEST_CONN_PORT (12345) #define TEST_CONN_PORT (12345)
#define TEST_CONN_ADDRESS_PORT "127.0.0.1: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, void test_conn_lookup_addr_helper(const char *address,
int family, tor_addr_t *addr); int family, tor_addr_t *addr);