Nick Mathewson
fecc5fd38d
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-05-06 16:47:03 -04:00
Nick Mathewson
d04b708b4b
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-06 16:47:03 -04:00
Nick Mathewson
3e42464f5a
Merge branch 'bug34078_prelim_035' into bug34078_prelim_041
2020-05-06 15:18:36 -04:00
Nick Mathewson
75547c01a3
Replace a "fall through" comment that was outside a switch.
2020-05-06 15:08:02 -04:00
Nick Mathewson
bbfc498e21
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-04 10:25:52 -04:00
Nick Mathewson
6aaee6133d
Merge branch 'bug34077_042' into bug34077_043
2020-04-30 23:01:58 -04:00
Nick Mathewson
b4b1882da0
Merge branch 'bug34077_041' into bug34077_042
2020-04-30 22:59:08 -04:00
Nick Mathewson
d7e166bd95
Fix a GCC 10.0.1 compilation warning.
...
Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC
first gives this warning for 9eeff921ae
)
2020-04-30 22:56:31 -04:00
teor
d4a74021e5
relay/dirauth: Set some output arguments in stubs
...
And document how some functions set their output arguments.
Fixes bug 33674; bugfix on 0.4.3.1-alpha.
2020-03-20 07:56:26 -04:00
teor
250b8499b8
dirauth: Remove a duplicate macro definition
...
Obviously correct changes to already-reviewed code.
2020-03-20 15:39:55 +10:00
Nick Mathewson
855cd533e1
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
2020-03-16 12:21:49 -04:00
Nick Mathewson
452398913a
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
2020-03-16 10:40:55 -04:00
Neel Chauhan
460b97380b
Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
2020-03-16 10:40:14 -04:00
Nick Mathewson
f733b8acd6
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
2020-02-20 08:48:17 -05:00
Nick Mathewson
d0c3350218
Run "make autostyle".
2020-02-12 18:25:51 -05:00
David Goulet
f0964628e6
Merge branch 'ticket33029_042_01' into ticket33029_043_03
...
Conflicts:
doc/tor.1.txt
src/app/config/config.c
src/app/config/or_options_st.h
src/core/mainloop/connection.h
Between 042 and 043, the dirauth options were modularized so this merge commit
address this by moving the AuthDirRejectUncompressedRequests to the module
along with a series of accessors.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-11 10:30:29 -05:00
Nick Mathewson
7f03ba06d8
Merge branch 'ticket32806'
2020-01-17 08:37:33 -05:00
Nick Mathewson
6d2b9c9631
Remove some dead checks
...
The only code that could set these options to be negative was in the
unit tests.
2020-01-17 08:31:22 -05:00
Nick Mathewson
648e1afc33
fix a stray asterisk in a comment
2020-01-17 08:25:09 -05:00
Nick Mathewson
01fdc3240f
Merge branch 'ticket32695_squashed'
2020-01-16 16:42:01 -05:00
Nick Mathewson
8d94bcbf8c
Remove routerstatus_format_entry() consensus_method argument as unused
2020-01-16 16:41:53 -05:00
Nick Mathewson
441a048a3a
Remove support for now-obsolete consensus methods before 28.
...
Closes ticket 32695.
2020-01-16 16:41:53 -05:00
teor
f3cbc26bdd
add_c_file: Fix "control line not preceded by a blank line"
...
Fix dirauth and relay module include.am add_c_file.py
"control line not preceded by a blank line" errors.
Also remove a duplicate ADD_C_FILE: SOURCES in the relay module.
Obviously correct fixes to already-reviewed code.
2020-01-16 09:38:26 +10:00
Nick Mathewson
73ac1add3f
Split core/include.am into per-subdirectory include.am files
...
Closes ticket 32137.
2020-01-13 09:34:17 -05:00
Nick Mathewson
93894fb770
Merge branch 'ticket22029_attempt_squashed'
2020-01-09 15:27:32 -05:00
Neel Chauhan
d0068be0dd
Allow ed25519 keys to be banned in approved-routers
2020-01-09 15:27:26 -05:00
Nick Mathewson
e45810113b
Merge branch 'pre_formatter_cleanups_squashed'
2020-01-09 07:32:39 -05:00
Nick Mathewson
09f03e6e3f
Turn authdir_mode_v3() into a non-inline function
...
This change means that authmode.h no longer needs to see
or_options_t, and frees us from an ordering dependency.
2020-01-09 07:30:35 -05:00
Nick Mathewson
2f7a2c42d2
Include ht.h in all headers that use HT_ENTRY()
...
Without this change, compilation success depends on include order in
several tricky ways.
2020-01-09 07:30:35 -05:00
Nick Mathewson
4f02812242
It's 2020. Update the copyright dates with "make update-copyright"
2020-01-08 18:39:17 -05:00
teor
cd160291a7
Code Style: Delete headers that are included twice
...
These changes were created using the "make autostyle" from
32522, and then split into commits.
2019-12-20 09:53:31 +10:00
teor
d8b868e483
Code Style: Delete PRIVATE defines that are never used
...
Some ".c" files define *_PRIVATE macros, but those macros are
not used in any header file. Delete them.
These changes were created using the "make autostyle" from
32522, and then split into commits.
2019-12-20 09:50:50 +10:00
Nick Mathewson
3210598c30
Move TestingDirVote{Exit,Guard,HSdir}{,IsStrict} to dirauth module
2019-12-19 10:42:44 -05:00
Nick Mathewson
3739503404
Move TestingMin{Exit,Fast}FlagThreshold to dirauth module.
2019-12-19 10:14:09 -05:00
Nick Mathewson
cde5abfdc6
Move TestingDirAuthTimeToLearnReachability into dirauth module.
2019-12-19 10:08:22 -05:00
Nick Mathewson
be9bc5981f
Move MinMeasuredBWsForAuthToIgnoreAdvertised to dirauth module.
2019-12-19 09:51:11 -05:00
Nick Mathewson
0c7fd83123
Move ConsensusParams to dirauth module.
2019-12-19 09:46:14 -05:00
Nick Mathewson
77dea66e19
Move MinUptimeHidServDirectoryV2 to dirauth module.
2019-12-19 09:43:25 -05:00
Nick Mathewson
b1d029b9a1
Move AuthDirTestEd25519LinkKeys to the dirauth module.
2019-12-19 09:38:25 -05:00
Nick Mathewson
f4f70e1f13
Move AuthDirSharedRandomness to dirauth module.
2019-12-19 09:34:27 -05:00
Nick Mathewson
99874ecc1d
Move AuthDirPinKeys to dirauth module.
2019-12-19 09:34:18 -05:00
Nick Mathewson
9386b0b28a
Move AuthDirListBadExits to dirauth module.
2019-12-19 09:24:57 -05:00
Nick Mathewson
eedab30a7b
Move AuthDirHasIPv6Connectivity into dirauth module.
2019-12-19 09:19:02 -05:00
Nick Mathewson
7d5e360c3b
Move BW-guarantee options in to dirauth module.
2019-12-19 08:57:47 -05:00
Nick Mathewson
ea91edff15
Dirauth options: move versioning options to dirauth module
...
This commit moves VersioningAuthoritativeDirectory,
RecommendedClientVersions, and RecommendedServerVersions.
2019-12-19 08:57:47 -05:00
Nick Mathewson
13df744921
Declare relay/dirauth subsystem levels in a header.
...
This way, we can't get out of sync between the two declarations.
2019-12-19 07:54:56 -05:00
Nick Mathewson
ffa3499d81
Add config object for dirauth; move one option there.
...
I've chosen the "AuthDirMaxServersPerAddr" option here for
simplicity, since it is used literally nowhere else besides the dirauth
module. Once we have all the infrastructure in place for this, we
can move more options into this structure.
2019-12-19 07:54:56 -05:00
Nick Mathewson
5e2318165d
Add "stub" files for disabled modules.
...
These modules are only built when the selected modules are disabled.
The provide stub implementations of the subsystem blocks. Later,
other stub implementations could move here.
Having real subsystem blocks here will let us handle disabled
configuration options better.
2019-12-19 07:54:56 -05:00
Nick Mathewson
fcb5656128
Merge branch 'ticket32609_squashed'
2019-12-04 12:15:28 -05:00
teor
9ad569c71d
practracker: Add missing .may_include files
...
All of these files contain "*.h", except for:
* src/app/config/.may_include
* src/test/.may_include
which also contain "*.inc".
This change prevents includes of "*.c" files, and other
unusually named files.
Part of 32609.
2019-12-04 12:15:22 -05:00