Commit Graph

37758 Commits

Author SHA1 Message Date
Alexander Færøy
ee38ec02f3 Use TOR_PRIuSZ instead of %ld for CC logging.
This patch fixes the current build of main on Windows.
2021-10-29 19:08:20 +00:00
Alexander Færøy
77f5bfa60e Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-29 16:56:33 +00:00
Alexander Færøy
57f296b396 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-29 16:56:33 +00:00
Alexander Færøy
558037f6ed Merge branch 'maint-0.4.6' into main 2021-10-29 16:56:33 +00:00
Alexander Færøy
5c8deef9b6 Fix Windows build.
While trying to resolve our CI issues, the Windows build broke with an
unused function error:

   src/test/test_switch_id.c:37:1: error: ‘unprivileged_port_range_start’
   defined but not used [-Werror=unused-function]

We solve this by moving the `#if !defined(_WIN32)` test above the
`unprivileged_port_range_start()` function defintion such that it is
included in its body.

This is an unreviewed commit.

See: tor#40275
2021-10-29 16:52:18 +00:00
David Goulet
294e8a8879 Merge branch 'maint-0.4.6' 2021-10-29 09:20:44 -04:00
David Goulet
3ebf217009 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-29 09:20:21 -04:00
David Goulet
77c47417f2 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-29 09:20:21 -04:00
David Goulet
bec9c61f5b changes: Add file for ticket 26299
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-29 09:20:17 -04:00
David Goulet
f5bd575401 changes: Add file for ticket 26299
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-29 09:19:59 -04:00
David Goulet
92fedb9f44 changes: Add file for ticket 26299
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-29 09:19:21 -04:00
Roger Dingledine
7084ec8710 don't retry entry guards if they're bridges without descriptors
When we don't yet have a descriptor for one of our bridges, disable
the entry guard retry schedule on that bridge. The entry guard retry
schedule and the bridge descriptor retry schedule can conflict,
e.g. where we mark a bridge as "maybe up" yet we don't try to fetch
its descriptor yet, leading Tor to wait (refusing to do anything)
until it becomes time to fetch the descriptor.

Fixes bug 40497; bugfix on 0.3.0.3-alpha.
2021-10-28 20:57:28 -04:00
Roger Dingledine
f9cb7e3398 do notice-level log when we resume having enough dir info
we do a notice-level log when we decide we *don't* have enough dir
info, but in 0.3.5.1-alpha (see commit eee62e13d9, #14950) we lost our
corresponding notice-level log when things come back.

bugfix on 0.3.5.1-alpha; fixes bug 40496.
2021-10-28 20:57:28 -04:00
Roger Dingledine
db34f6c9e8 handle other de-sync cases from #40396
Specifically, every time a guard moves into or out of state
GUARD_REACHABLE_MAYBE, it is an opportunity for the guard reachability
state to get out of sync with the have-minimum-dir-info state.

Fixes even more of #40396.
2021-10-28 20:57:28 -04:00
Roger Dingledine
3c8510e2c0 reassess minimum-dir-info when a bridge fails
When we try to fetch a bridge descriptor and we fail, we mark
the guard as failed, but we never scheduled a re-compute for
router_have_minimum_dir_info().

So if we had already decided we needed to wait for this new descriptor,
we would just wait forever -- even if, counterintuitively, *losing* the
bridge is just what we need to *resume* using the network, if we had it
in state GUARD_REACHABLE_MAYBE and we were stalling to learn this outcome.

See bug 40396 for more details.
2021-10-28 20:57:28 -04:00
Roger Dingledine
867c3c6f89 only log "new bridge descriptor" if really new
The bridge descriptor fetching codes ends up fetching a lot of duplicate
bridge descriptors, because this is how we learn when the descriptor
changes.

This commit only changes comments plus whether we log that one line.

It moves us back to the old behavior, before the previous commit for
30496, where we would only log that line when the bridge descriptor
we're talking about is better than the one we already had (if any).
2021-10-28 20:57:28 -04:00
David Goulet
fbc6d2d76a makefile: Add a reproducible dist make job
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 16:29:45 -04:00
David Goulet
8da8105ee2 makefile: Add a reproducible dist make job
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 16:29:37 -04:00
David Goulet
8cf6f9183c makefile: Add a reproducible dist make job
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 16:29:22 -04:00
Alexander Færøy
c845f2e4b2 release: Patches to make tarball reproducible
Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 14:45:31 -04:00
Alexander Færøy
11fedab9ce release: Patches to make tarball reproducible
Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 14:31:52 -04:00
David Goulet
02d86bc21b Merge branch 'maint-0.4.6' 2021-10-28 14:27:17 -04:00
David Goulet
5363d9b118 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-28 14:26:35 -04:00
David Goulet
a80868c118 changes: Typo in file, wrong version was used
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 14:22:14 -04:00
Alexander Færøy
d37273be0d release: Patches to make tarball reproducible
Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 13:42:02 -04:00
David Goulet
489c852da0 Merge branch 'maint-0.4.6' 2021-10-28 10:38:20 -04:00
David Goulet
89073bda5f Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-28 10:38:20 -04:00
Alexander Færøy
31fa3cc1a0 Fix compilation on systems with older compilers.
This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
2021-10-28 10:37:45 -04:00
David Goulet
a543657f34 Merge branch 'maint-0.4.6' 2021-10-28 09:42:38 -04:00
David Goulet
fa405ca27f Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-28 09:42:32 -04:00
David Goulet
7c4fd150cd Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-28 09:42:25 -04:00
David Goulet
8c970963a9 version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:42:08 -04:00
David Goulet
27caad6f5c version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:41:56 -04:00
David Goulet
97c976778a version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:41:13 -04:00
David Goulet
fa438b6cf0 version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:40:50 -04:00
David Goulet
5530af675b scripts: Quiet the IPFire location GeoIP command
We do this to avoid useless outputs but also, in the CI environement,
the Python logging package stacktraces with a problem on a socket.

The command still works but the logging fails. With the quiet switch, we
don't get such stacktrace.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-27 10:24:13 -04:00
David Goulet
5e1f64602b scripts: Add -M option to git-list-tor-branches.sh
Omit all "maint" branch. It is the opposite of -R that omits release
branches.

In other words, -M can be used to list all release branches.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 15:52:53 -04:00
David Goulet
61aed5200c Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-26 14:33:49 -04:00
David Goulet
ae92a92453 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-26 14:33:49 -04:00
David Goulet
304bd31d49 Merge branch 'maint-0.4.6' 2021-10-26 14:33:49 -04:00
David Goulet
14385ce71e ci: Missing source dir when parsing configure.ac version
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 14:33:31 -04:00
David Goulet
3e61a9c8a5 Merge branch 'maint-0.4.6' 2021-10-26 11:31:41 -04:00
David Goulet
4f1b9923b2 version: Bump to 0.4.7.2-alpha-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:31:38 -04:00
David Goulet
90a74a2ea8 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-26 11:31:28 -04:00
David Goulet
d672cc6e47 version: Bump to 0.4.6.8-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:31:24 -04:00
David Goulet
d4af7bdb26 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-26 11:31:14 -04:00
David Goulet
00ff6dffa1 version: Bump to 0.4.5.11-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:31:06 -04:00
David Goulet
66193ee708 version: Bump to 0.3.5.17-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:30:56 -04:00
David Goulet
4e921f5b88 version: Bump to 0.4.7.2-alpha
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 09:23:35 -04:00
David Goulet
f31e4050db Merge branch 'maint-0.4.6' 2021-10-26 09:18:05 -04:00