Nick Mathewson
67fc69c8c1
Merge branch 'maint-0.4.4'
2020-08-06 13:24:12 -04:00
Nick Mathewson
c1b440f760
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-06 13:24:12 -04:00
Nick Mathewson
39d5e7c764
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-06 13:24:11 -04:00
Nick Mathewson
352991c843
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-06 13:24:11 -04:00
Nick Mathewson
bac8967e24
Copy from master gitlab-ci.yml from master back to maint-0.3.5
2020-08-06 12:42:14 -04:00
George Kadianakis
afd88ee87f
Merge remote-tracking branch 'tor-gitlab/mr/88'
2020-08-05 14:57:20 +03:00
Nick Mathewson
04926126ee
Merge remote-tracking branch 'tor-gitlab/mr/100'
2020-08-04 13:28:51 -04:00
Daniel Pinto
ccdd0d801a
Minor style improvements. #30045
2020-08-03 20:08:17 +01:00
George Kadianakis
e069b0af4b
Merge branch 'maint-0.4.4'
2020-08-03 16:49:05 +03:00
George Kadianakis
18d2c7c5d7
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
2020-08-03 16:48:52 +03:00
Nick Mathewson
ce57404a42
Fix comment on protover_list_is_invalid
2020-08-03 08:57:21 -04:00
Nick Mathewson
efc969e862
Rename protover_contains_long_protocol_names to protover_list_is_invalid
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
protover_contains_long_protocol_names protover_list_is_invalid
2020-08-03 08:55:17 -04:00
Nick Mathewson
d1fda62d11
Merge remote-tracking branch 'tor-gitlab/mr/94'
2020-08-03 08:54:03 -04:00
Nick Mathewson
3e3b0b0443
Merge remote-tracking branch 'tor-github/pr/1986/head'
2020-08-03 08:33:22 -04:00
Nick Mathewson
efe8a98817
Fix a leak-on-failure on test_get_bandwidth_lines()
...
Spotted by coverity. This is CID 1465571.
2020-08-01 09:29:08 -04:00
Daniel Pinto
1474ab3395
Add --format argument to --key-expiration option. #30045
2020-08-01 01:08:37 +01:00
Neel Chauhan
837e0c4dc9
Code simplifications for AP_CONN_STATE_CONTROLLER_WAIT
2020-07-31 09:21:43 -07:00
Nick Mathewson
700e8a8bb0
Remove now-outdated part of 33812 changes file.
2020-07-31 21:10:54 +05:30
MrSquanchee
5ca03f1ebd
Changes 33812 : Add ticket number to all paragraphs
...
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
2020-07-31 21:12:44 +05:30
MrSquanchee
bb585c5e37
test_stats : Removed CONFIG_PRIVATE
...
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
2020-07-31 21:12:29 +05:30
MrSquanchee
a93c3d7a8d
Added tests for bandwidth functions
...
Added tests for
1. commit_max
2. advance_obs
3. add_obs
4. rep_hist_fill_bandwidth_history
5. rep_hist_get_bandwidth_lines
(Lightly edited by nickm to use new names from bwhist refactoring.)
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
2020-07-31 21:12:16 +05:30
MrSquanchee
708f51637f
Added tests for bandwidth functions
...
Added tests for
1. commit_max
2. advance_obs
3. add_obs
4. rep_hist_fill_bandwidth_history
5. rep_hist_get_bandwidth_lines
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
2020-07-31 21:10:54 +05:30
Nick Mathewson
b5068e4826
Extract bw_array_t and related constants into a header.
...
This will be used for testing.
Partially reproduces work by MrSquanchee in #33812 .
2020-07-31 10:46:52 -04:00
Alexander Færøy
4c22050de1
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-31 02:03:35 +00:00
Alexander Færøy
badc52b7b1
Merge branch 'maint-0.4.4'
2020-07-31 02:03:35 +00:00
Alexander Færøy
e78a7450a2
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-31 02:03:34 +00:00
Alexander Færøy
4e684c8695
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-31 02:03:34 +00:00
Nick Mathewson
4c810a6abe
Merge branch 'bug40076_044'
2020-07-30 14:35:06 -04:00
Nick Mathewson
b4400e2093
Merge branch 'bug40076_043' into bug40076_044
2020-07-30 14:28:11 -04:00
Nick Mathewson
69d7752937
Merge branch 'bug40076_042' into bug40076_043
2020-07-30 14:27:29 -04:00
Nick Mathewson
c2d5ec5e43
Merge branch 'maint-0.4.2' into bug40076_042
2020-07-30 14:27:29 -04:00
Nick Mathewson
c4742b89b2
Fix a bug in buf_move_all() when the input buffer is empty.
...
We found this in #40076 , after we started using buf_move_all() in
more places. Fixes bug #40076 ; bugfix on 0.3.3.1-alpha. As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".
2020-07-30 14:24:25 -04:00
Nick Mathewson
0a588821cb
Add unit test for buf_move_all(), including a failing case
...
The failing case is #if'd out for now, but will be fixed in the next
commit.
Testing for a fix for #40076 .
2020-07-30 14:19:32 -04:00
George Kadianakis
155e0dee49
Merge branch 'tor-gitlab/mr/84'
2020-07-30 19:49:25 +03:00
Nick Mathewson
219edc9ab1
Handle ORPort auto when logging about removed orports.
...
Closes #40075
2020-07-30 19:46:44 +03:00
George Kadianakis
2bb9acca73
Write unittest for #40065 .
...
Make the unit test pass by including an explicit IPv6 port and an
implicit IPv4 port. See comments for more details.
2020-07-30 19:46:39 +03:00
Nick Mathewson
fc5fe094b1
Fix segfault and logic error in remove_duplicate_orports()
...
This function tried to modify an array in place, but did it in a
pretty confusing and complicated way. I've revised it to follow a
much more straightforward approach.
Fixes bug #40065 .
2020-07-30 19:46:02 +03:00
Nick Mathewson
fcf4954cc8
Add a unit test for write_str_to_file_if_not_equal()
2020-07-30 10:46:15 -04:00
Nick Mathewson
f3e5b283ad
test_util.c: Extract utime() function.
...
We need this to manipulate mtimes, but only in this file.
2020-07-30 10:46:15 -04:00
Neel Chauhan
67a62ccf51
Use write_str_if_not_equal() for onion services
2020-07-30 10:46:15 -04:00
Neel Chauhan
c212578bf0
Introduce write_str_if_not_equal()
2020-07-30 10:46:15 -04:00
Nick Mathewson
0c8c295963
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-29 12:37:08 -04:00
Nick Mathewson
9164d7c75e
Merge branch 'maint-0.4.4'
2020-07-29 12:37:08 -04:00
Nick Mathewson
3b8bf743ae
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-29 12:37:07 -04:00
Nick Mathewson
cdb0e6c252
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-29 12:37:07 -04:00
Nick Mathewson
c7502b6503
Add a changes file from mr 86 for 40072 fix.
2020-07-29 12:36:56 -04:00
Nick Mathewson
8c92d44622
Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4
2020-07-29 12:35:57 -04:00
Nick Mathewson
75f94ea1ec
Merge remote-tracking branch 'tor-github/pr/1987/head'
2020-07-29 10:58:47 -04:00
Alexander Færøy
eba2870d18
Merge branch 'maint-0.4.4'
2020-07-29 13:58:14 +00:00
Alexander Færøy
8e690ce736
Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4
2020-07-29 13:57:47 +00:00