AmreshVenugopal
6413b2102f
control: Add GETINFO support for dumping microdesc consensus
...
- Allows control port to read microdesc consensus using:
GETINFO dir/status-vote/microdesc/consensus
add: Helper function `getinfo_helper_current_consensus`
test: check if GETINFO commands return expected consensus data.
Resolves 31684.
2019-10-21 13:54:55 +10:00
Nick Mathewson
6846d14868
Merge branch 'ticket30924_042_04_squashed_merged'
2019-09-09 12:35:27 -04:00
Nick Mathewson
a642a4cbd7
Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged
2019-09-09 11:10:53 -04:00
David Goulet
622c2c7884
hs-v3: Rename validation function in hs_intropoint.c
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-09-09 11:07:51 -04:00
David Goulet
385f6bcfcc
hs-v3: Move DoS parameter check against 0
...
Move it outside of the validation function since 0 is a valid value but
disables defenses.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-09-09 11:07:36 -04:00
David Goulet
a8a1ea4e0e
practracker: Make you happy funny script
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-09-09 11:06:51 -04:00
David Goulet
f16fc262e5
Merge branch 'tor-github/pr/1298'
2019-09-09 11:05:51 -04:00
David Goulet
1e7c7870e8
Merge branch 'tor-github/pr/1287'
2019-09-09 10:51:19 -04:00
Nick Mathewson
a727d4a3a1
Remove unused struct_var_* functions.
...
These turned out to be unnecessary, so let's not keep them around
and let them start getting complicated.
Closes ticket 31630.
2019-09-05 15:24:54 -04:00
George Kadianakis
545c21e23d
Merge branch 'tor-github/pr/1295'
2019-09-05 17:13:29 +03:00
George Kadianakis
ddd01541b9
Merge branch 'tor-github/pr/1294'
2019-09-05 17:12:19 +03:00
George Kadianakis
fb56b4c2bf
Merge branch 'tor-github/pr/1293'
2019-09-05 17:10:07 +03:00
George Kadianakis
c750ec20ab
Merge branch 'tor-github/pr/1291'
2019-09-05 17:09:20 +03:00
George Kadianakis
c29f05b159
Merge branch 'tor-github/pr/1292'
2019-09-05 17:06:58 +03:00
George Kadianakis
cdd7e88970
Merge branch 'tor-github/pr/1261'
2019-09-05 17:02:53 +03:00
Neel Chauhan
0127888b06
Add tests for IPv6 exit policies on microdescriptors
2019-09-05 17:02:45 +03:00
Neel Chauhan
be4a60945d
Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()
2019-09-05 17:02:45 +03:00
Nick Mathewson
eb909c4e43
config: note that some arguments are required.
2019-09-05 07:57:36 -04:00
Nick Mathewson
2591440faa
Merge remote-tracking branch 'tor-github/pr/1278'
2019-09-05 07:41:58 -04:00
teor
9a402a654a
Merge branch 'maint-0.4.1'
2019-09-05 14:48:09 +10:00
teor
4596ead2fc
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-05 14:48:02 +10:00
teor
896a1ac50b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-05 14:47:54 +10:00
teor
0461837149
Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
2019-09-05 14:47:34 +10:00
teor
2ff6ebc6fc
Merge branch 'maint-0.4.1'
...
Resolved modified/deleted conflict on changes/bug30649 by deleting
the file.
tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of
changes/bug30649. We cherry-picked it to master, as well as merging
to release-0.4.1.
2019-09-05 12:08:02 +10:00
teor
9dd908e713
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-05 12:05:12 +10:00
teor
c08d3e46ca
Merge commit '73890a86ef' into maint-0.4.1
...
tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
This is an "ours" merge, except for the bugfix version change in
changes/bug30649.
2019-09-05 12:04:27 +10:00
George Kadianakis
c1d61141f1
Add #30649 to ReleaseNotes.
2019-09-05 11:58:23 +10:00
George Kadianakis
87aaa9a2a5
Fix #30649 changelog entry.
2019-09-05 11:58:18 +10:00
George Kadianakis
73890a86ef
Merge branch 'bug30649_040' into bug30649_maint_041
2019-09-05 11:48:03 +10:00
George Kadianakis
61082c059c
Fix bugfix version in Bug 30649: Changes file.
2019-09-05 11:46:25 +10:00
teor
1203e137be
Merge commit '763fd0ad66' into maint-0.4.0
...
tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
2019-09-05 11:42:26 +10:00
George Kadianakis
763fd0ad66
Fix bugfix version in Bug 30649: Changes file.
2019-09-05 11:41:45 +10:00
teor
4f762bc41d
Makefile: include checkShellScripts.sh in EXTRA_DIST
...
Part of 30967.
2019-09-05 11:16:29 +10:00
teor
4b1d2ba979
changes: file for 30967
2019-09-05 11:15:30 +10:00
teor
5c2941e69f
shellcheck: Add shellcheck to the pre-commit hook
...
* Move the shellcheck script from the Makefile to its own script file
* Reformat the shellcheck script so it's easier to read and modify
* Call the shellcheck script from the pre-commit hook
Fixes bug 30967; not in any released version of Tor.
2019-09-05 11:15:26 +10:00
teor
d14573a623
Makefile: Explicitly list the subdirectories that contain scripts
...
Part of 30967.
2019-09-05 11:15:22 +10:00
Nick Mathewson
88839ab2ac
Remove _ex suffix from typed_var_*_ex() functions.
...
Now that the variants of these functions that took config_line_t are
gone, there is no longer any reason for the remaining variants to
have "ex" at the end of their names.
This commit was made by running this perl script over all the files
in src/:
#!/usr/bin/perl -w -i -p
s{typed_var_(assign|free|encode|copy|eq|ok|kvassign|kvencode|mark_fragile)_ex}
{typed_var_$1}g;
2019-09-04 15:01:49 -04:00
Nick Mathewson
161c392a4f
typedvar: remove now-unused functions taking config_type_t.
...
These functions are no longer used.
Part of 31629.
2019-09-04 14:54:59 -04:00
Nick Mathewson
b3c2867715
Document fields of struct_magic_decl_t.
2019-09-04 14:23:19 -04:00
Nick Mathewson
3db56aeeb8
Document warn_deprecated_option().
2019-09-04 14:23:19 -04:00
Nick Mathewson
39316da9b6
Document return value of config_mgr_add_format().
2019-09-04 14:23:19 -04:00
Nick Mathewson
39dd2e2aa8
Document validate_fn_t as it stands.
...
Also document that it will be changed in a later branch.
2019-09-04 14:23:19 -04:00
Nick Mathewson
aeda598fd5
config_assign: Document CAL_* options.
...
These were sort of described in config_assign() documentation, but
not so well.
2019-09-04 14:23:19 -04:00
Nick Mathewson
577ea20b3a
Document configuration and abbreviation types.
2019-09-04 14:23:19 -04:00
Nick Mathewson
106b75aa53
changes file for 31532
2019-09-04 12:06:27 -04:00
Nick Mathewson
3aba13f779
buffers: use ptrdiff_t to indicate offsets.
...
Previously we used int in some places and off_t for others. Neither
is correct: ptrdiff_t is right for differences between pointers.
(off_t is only for offsets and sizes on the filesystem.)
2019-09-04 12:06:27 -04:00
Nick Mathewson
ec724fe8c8
rendclient: use ptrdiff, not off_t, for offset of DH field.
...
The off_t type is only useful for offsets on the filesystem. For
in-memory offsets, use ptrdiff_t.
2019-09-04 12:06:27 -04:00
Nick Mathewson
b39ee42904
compat_compiler: fix documentation for STRUCT_VAR_P
...
Previously we had said that off_t was a reasonable type to hold the
result of offsetof(). That isn't so: ptrdiff_t is correct.
2019-09-04 12:06:27 -04:00
Nick Mathewson
dc199f40fb
smartlist_pqueue: use ptrdiff_t instead of int for offsets.
...
This is technically correct, but should not matter in practice,
since we don't use this on any structs whose size exceeds INT_MAX.
2019-09-04 12:06:27 -04:00
Nick Mathewson
03ce67d378
config: explain CONFIG_TYPE_EXTENDED
...
Also add an explanation of a possible future refactoring where we
might remove the config_type_t enumeration entierly.
Fixes ticket 31624.
No changes file, since this is a comment-only change.
2019-09-04 11:54:42 -04:00