teor
e91b999cf2
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
2019-03-08 19:37:18 +10:00
teor
08ddf1f62b
Merge remote-tracking branch 'bug28525_029' into maint-0.3.5
2019-03-08 12:33:00 +10:00
Neel Chauhan
63b4049114
Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware
...
Fixes 28525.
2019-03-08 12:19:12 +10:00
Nick Mathewson
72751f0c30
Merge remote-tracking branch 'tor-github/pr/680'
2019-03-05 11:53:31 -05:00
George Kadianakis
c5da1f1cd5
Merge branch 'tor-github/pr/723'
2019-03-04 18:55:28 +02:00
Nick Mathewson
cb0d403049
Merge remote-tracking branch 'tor-github/pr/677'
2019-03-01 08:22:43 -05:00
teor
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
teor
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +10:00
teor
6a61a020ee
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:49:19 +10:00
teor
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +10:00
teor
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
teor
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
Nick Mathewson
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -05:00
Nick Mathewson
56f01e58b4
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
2019-02-27 09:59:33 -05:00
teor
d4b7975ce7
test/shared-random: use sr_state_free_all() rather than sr_state_free()
...
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3.
Part of 29599.
2019-02-27 15:06:53 +10:00
teor
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
teor
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
teor
15dc33849e
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-27 09:38:04 +10:00
teor
1a194beb2c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-27 09:37:50 +10:00
teor
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
David Goulet
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
George Kadianakis
7fbfdf2af7
Merge branch 'tor-github/pr/611'
2019-02-26 12:33:23 +02:00
Nick Mathewson
e138bb8ffc
Downgrade some LOG_ERR messages in the address/* tests to warnings
...
Fixes bug 29530, where the LOG_ERR messages were occurring when
we had no configured network, and so we were failing the unit tests
because of the recently-merged #28668 .
Commit message edited by teor:
We backported 28668 and released it in 0.3.5.8.
This commit backports 29530 to 0.3.5.
Fixes bug 29530 in Tor 0.3.5.8.
2019-02-26 09:53:59 +10:00
Nick Mathewson
626e6d2c39
Merge remote-tracking branch 'tor-github/pr/684'
2019-02-25 13:33:39 -05:00
rl1987
d731ab4583
Check that all valid values of int and unsigned int can be put into void pointer
2019-02-25 20:04:02 +02:00
Nick Mathewson
065e7da8e6
Re-enable and fix unit test for nofork mappings
...
This test was previously written to use the contents of the system
headers to decide whether INHERIT_NONE or INHERIT_ZERO was going to
work. But that won't work across different environments, such as
(for example) when the kernel doesn't match the headers. Instead,
we add a testing-only feature to the code to track which of these
options actually worked, and verify that it behaved as we expected.
Closes ticket 29541; bugfix not on any released version of Tor.
2019-02-25 08:55:25 -05:00
George Kadianakis
331a067ae3
Fix dist_min_usec documentation and naming.
2019-02-25 13:46:58 +02:00
George Kadianakis
341cd6ea66
histogram_edges is histogram_len long
2019-02-25 13:28:35 +02:00
Nick Mathewson
34601105a3
Merge branch 'ticket29065_squashed'
2019-02-24 17:02:35 -05:00
rl1987
b7dced893a
Fix shellcheck SC2006 warnings in test_switch_id.sh
2019-02-24 17:02:06 -05:00
George Kadianakis
f229a33685
Merge remote-tracking branch 'nickm/thread_rng'
2019-02-22 16:07:57 +02:00
rl1987
c346eff223
Walk back from requiring bash
...
Refrain from using bash array to remember $@.
2019-02-21 21:09:40 +02:00
Nick Mathewson
aa79196ee0
Merge branch 'maint-0.4.0'
2019-02-21 09:10:34 -05:00
Nick Mathewson
34183f0d71
Fix a goofy change from abcde10fce that broke test-slow linking
...
boklm tracked this down, and it doesn't make sense. It caused
This change goes back to the previous LDFLAGS line.
2019-02-21 09:10:15 -05:00
David Goulet
da179088ee
Merge branch 'tor-github/pr/687'
2019-02-20 12:09:02 -05:00
David Goulet
7037fe1163
Merge branch 'tor-github/pr/700'
2019-02-20 12:06:39 -05:00
rl1987
b7ad8bcaad
Use setrlimit instead of ulimit -c in backtrace tests
2019-02-20 12:06:26 -05:00
Roger Dingledine
c22446e305
Merge branch 'maint-0.4.0'
2019-02-20 10:40:20 -05:00
Roger Dingledine
5ec65be8bf
Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
2019-02-20 10:39:28 -05:00
Roger Dingledine
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
Nick Mathewson
208f04e9b8
Add a quick test for get_thread_fast_rng()
2019-02-19 15:36:11 -05:00
Nick Mathewson
d32e407976
Downgrade some LOG_ERR messages in the address/* tests to warnings
...
Fixes bug 29530, where the LOG_ERR messages were occurring when
we had no configured network, and so we were failing the unit tests
because of the recently-merged #28668 .
Bug not in any released Tor.
2019-02-19 14:02:32 -05:00
Nick Mathewson
c9ff6a7f83
Mark map_anon_nofork test as skipped in 0.4.0
...
This test fails in some environments; since the code isn't used in
0.4.0, let's disable it for now.
Band-aid solution for #29534 ; bug not in any released Tor.
2019-02-19 13:14:26 -05:00
Nick Mathewson
6927e9a60c
Merge remote-tracking branch 'tor-github/pr/665'
2019-02-19 11:56:48 -05:00
Nick Mathewson
f70929347f
Merge branch 'maint-0.4.0'
2019-02-19 11:49:24 -05:00
Nick Mathewson
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
Kris Katterjohn
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-19 11:38:32 -05:00
Nick Mathewson
17e29bda5d
Merge branch 'maint-0.4.0'
2019-02-19 11:34:25 -05:00
Nick Mathewson
b5f3a3d6a7
Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0
2019-02-19 11:34:21 -05:00
Nick Mathewson
1239e411a7
Merge remote-tracking branch 'tor-github/pr/694'
2019-02-19 11:31:22 -05:00
