Nick Mathewson
7e9985b75a
Merge remote-tracking branch 'tor-github/pr/536'
2018-12-01 11:24:02 -05:00
Nick Mathewson
af9dc12fab
Merge branch 'maint-0.3.5'
2018-12-01 11:20:10 -05:00
Nick Mathewson
11a91ef728
Merge branch 'bug28229_diag_035' into maint-0.3.5
2018-12-01 11:20:04 -05:00
rl1987
945c4dfda0
Also log a Tor log entry when it has a substring we are waiting for
2018-12-01 11:18:03 -05:00
rl1987
4c4ed413ee
1 ms. resolution for Tor logs
2018-12-01 11:18:03 -05:00
rl1987
9bbf7ec303
Add changes file
2018-12-01 11:18:03 -05:00
rl1987
0bb25931dc
Log everything from tor down to debug loglevel
2018-12-01 11:18:03 -05:00
rl1987
320f5f30b3
In test_rebind.py, log stuff with timestamps
2018-12-01 11:18:03 -05:00
Nick Mathewson
cf3f7753c3
Merge branch 'maint-0.3.5'
2018-12-01 11:15:09 -05:00
Nick Mathewson
e82023d2f7
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-01 11:15:09 -05:00
Nick Mathewson
e3a19b1c78
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-01 11:15:09 -05:00
Nick Mathewson
9c2b114b2e
Merge branch 'maint-0.3.5'
2018-11-27 12:03:50 -05:00
Nick Mathewson
72c1303cef
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-27 12:03:50 -05:00
Alexander Færøy
36c3235534
Explicitly specify path to OpenSSL for Appveyor.
...
This patch explicitly specifies the path to our OpenSSL dependency and
disables the installation of an external OpenSSL version and instead
uses the OpenSSL version available from the MinGW environments.
See: https://bugs.torproject.org/28574
2018-11-27 14:53:50 +01:00
Nick Mathewson
8a15d0f69b
Merge branch 'maint-0.3.5'
2018-11-26 17:25:28 -05:00
Nick Mathewson
feb41b7c30
Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5
2018-11-26 17:24:41 -05:00
Nick Mathewson
c292e505ff
Merge remote-tracking branch 'tor-github/pr/539'
2018-11-26 17:22:37 -05:00
Nick Mathewson
fc1ad9ab65
Merge remote-tracking branch 'tor-github/pr/495'
2018-11-26 17:17:40 -05:00
Nick Mathewson
e12fdeb181
Changes file for "Dormant Mode" (28335, 2149).
2018-11-26 16:39:44 -05:00
Nick Mathewson
7d8e0cc9ab
Merge branch 'dormant_v2_squashed'
2018-11-26 16:33:31 -05:00
Nick Mathewson
02843c4a4e
Test for check_network_participation_callback()
2018-11-26 16:32:40 -05:00
Nick Mathewson
55512ef022
Test netstatus.c tracking of user participation status
2018-11-26 16:32:40 -05:00
Nick Mathewson
3743f79695
Add options to control dormant-client feature.
...
The DormantClientTimeout option controls how long Tor will wait before
going dormant. It also provides a way to disable the feature by setting
DormantClientTimeout to e.g. "50 years".
The DormantTimeoutDisabledByIdleStreams option controls whether open but
inactive streams count as "client activity". To implement it, I had to
make it so that reading or writing on a client stream *always* counts as
activity.
Closes ticket 28429.
2018-11-26 16:32:40 -05:00
David Goulet
2b9a907bdc
Merge branch 'maint-0.3.5'
2018-11-26 14:59:24 -05:00
David Goulet
056ffdec4c
Merge remote-tracking branch 'dgoulet/ticket28128_035_01' into maint-0.3.5
2018-11-26 14:59:10 -05:00
Taylor R Campbell
997a8b0ca7
Create a temporary directory for tor's DataDirectory in test_rebind.
...
Fixes #28562 .
While here, put the argument count test and usage message _before_ we
attempt to read from sys.argv.
2018-11-23 12:51:39 -05:00
teor
805f75182a
Entry Nodes: Test on reasonably live consensuses
...
As well as live consensuses.
Tests for 24661.
2018-11-22 17:47:12 +10:00
teor
390112d07e
Entry Nodes: refactor tests to use macros
...
Part of 24661.
2018-11-22 17:46:52 +10:00
teor
3741f9e524
Fix a comment typo in test_hs_common.c
2018-11-22 16:56:06 +10:00
teor
cebc39bcd5
Test: make unit tests use a reasonably live consensus
...
Cleanup after 24661.
2018-11-22 16:54:46 +10:00
teor
657618ba9b
Entry Nodes: Mark outdated dirservers in reasonably live consensuses
...
Fixes bug 28569; bugfix on Tor 0.3.2.5-alpha.
2018-11-22 16:54:34 +10:00
teor
d1ac5613fc
Entry Nodes: Use a reasonably live consensus to select guards
...
Fixes bug 24661; bugfix on 0.3.0.1-alpha.
2018-11-22 16:54:22 +10:00
teor
ffc7b81b5d
Test: Fix memory leaks and missing unmocks in entry guard tests
...
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is
missing some unmocks.
Fixes 28554; bugfix on 0.3.0.1-alpha.
2018-11-22 16:42:32 +10:00
Nick Mathewson
469f47ef8d
Fix a fun heisenbug in memoize_protover_flags()
...
After we clear the protover map for getting full, we need to
re-create it, since we are about to use it.
This is a bugfix for bug 28558. It is a bugfix for the code from
ticket 27225, which is not in any released Tor. Found by Google
OSS-Fuzz, as issue 11475.
2018-11-21 07:56:33 -05:00
Nick Mathewson
b406fdae4f
Merge branch 'ticket25341_merged_v2'
2018-11-20 13:14:56 -05:00
Nick Mathewson
a9820f072b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-20 13:10:38 -05:00
Nick Mathewson
56f24889a2
Merge branch 'maint-0.3.5'
2018-11-20 13:10:38 -05:00
Nick Mathewson
9da8cd0bc3
Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4
2018-11-20 13:10:18 -05:00
Nick Mathewson
34cadefe34
Merge branch 'maint-0.3.5'
2018-11-20 09:04:35 -05:00
Taylor Yu
0489288aa2
Update control_free_all() for #27169
...
Reset the added bootstrap tracking state introduced by ticket 27169.
Fixes bug 28524; bugfix on 0.3.5.1-alpha.
2018-11-19 15:48:08 -06:00
Nick Mathewson
8183640ada
Merge branch 'maint-0.3.5'
2018-11-19 10:18:57 -05:00
Alexander Færøy
3260914db0
Add missing library to build tor-print-ed-signing-cert.
...
To succesful compile tor-print-ed-signing-cert.exe on Windows we
sometimes need to include the @TOR_LIB_GDI@ library.
See: https://bugs.torproject.org/28485
2018-11-19 10:18:44 -05:00
Nick Mathewson
a4f2075170
Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2
2018-11-19 09:22:30 -05:00
Nick Mathewson
a8df39e955
Merge remote-tracking branch 'tor-github/pr/519'
2018-11-19 08:47:03 -05:00
Nick Mathewson
26539ec3ae
Merge remote-tracking branch 'tor-github/pr/518'
2018-11-19 08:45:41 -05:00
Nick Mathewson
48b08f0592
Merge branch 'ticket27359_v2_squashed'
2018-11-19 08:26:49 -05:00
Nick Mathewson
0e762c0cf5
Test new functions in nodelist.c
2018-11-19 08:26:10 -05:00
Nick Mathewson
4f9548f893
Expose more nodelist.c functions to tests
2018-11-19 08:26:10 -05:00
Nick Mathewson
aa1d767e6b
Aim for 100% test coverage on nodefamily.c
2018-11-19 08:26:10 -05:00
Nick Mathewson
426c9561c5
Use nodefamily_t in microdescriptors.
...
Closes ticket 27359.
2018-11-19 08:26:10 -05:00