vnepveu
43672f9fca
Implement IPv6 sybil protection.
...
[This is a squashed patch for ticket 7193, based on taking a "git
diff" for the original branch, then applying it with "git apply
-3". I earlier attempted to squash the branch with "git rebase",
but there were too many conflicts. --nickm]
2020-09-23 11:30:15 -04:00
Nick Mathewson
10e40ca1de
Merge branch 'ticket40136'
2020-09-22 16:54:35 -04:00
Nick Mathewson
d0b83c7423
state-contents: correcct the description of unusable_circuits
2020-09-22 16:51:26 -04:00
Nick Mathewson
ce1dfb46fc
Add a changes file for 40136 (state-contents.txt updates)
2020-09-22 14:46:41 -04:00
Nick Mathewson
5ffd8bf2b8
state-contents.txt: try to document circ-build-timeout fields
...
This should also get feedback from @mikeperry.
Closes #40136
2020-09-22 14:44:30 -04:00
Nick Mathewson
371cd7ac4f
Try to document pathbias fields in state file.
...
This will require feedback from @mikeperry, since these are a bit
subtle and I've likely mangled some of these.
2020-09-22 14:35:11 -04:00
Nick Mathewson
d1a94a3a7f
Improve doc/state-contents.txt
...
Part of a fix for #40136 .
This patch adds all the state file entries to the documentation, and
documents the ones that I understand well.
2020-09-22 14:17:26 -04:00
David Goulet
3f8201f229
Merge branch 'maint-0.4.4'
2020-09-22 13:47:08 -04:00
David Goulet
b6429430c6
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-09-22 13:47:08 -04:00
David Goulet
beffad8529
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-22 13:47:08 -04:00
David Goulet
4dbbc000b5
Merge branch 'tor-gitlab/mr/145'
2020-09-22 13:39:55 -04:00
David Goulet
faf89ec6c2
srv: Remove spammy debug log
...
Fixes #40135
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-22 11:06:34 -04:00
Nick Mathewson
679ba1a226
Merge branch 'maint-0.4.4'
2020-09-21 12:59:03 -04:00
Nick Mathewson
1cce0588e1
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-09-21 12:59:03 -04:00
Nick Mathewson
0d78fbb718
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-21 12:59:03 -04:00
Nick Mathewson
8458c8211e
gitlab-ci: Use test-network-all for debian-integration
2020-09-21 12:58:49 -04:00
Nick Mathewson
7280bb50b2
gitlab-ci: add an NSS check.
2020-09-21 12:58:49 -04:00
Nick Mathewson
3ee0f6371d
gitlab-ci: Add all-bugs-are-fatal on hardened and integration builds.
2020-09-21 12:58:49 -04:00
Nick Mathewson
ab03ca9c75
gitlab-ci: Add disable-module builds.
2020-09-21 12:58:49 -04:00
Nick Mathewson
1bbeddf99e
Add a few more options for the CI script.
...
These are:
--disable-module-relay
--disable-module-dirauth
--enable-all-bugs-are-fatal
--enable-nss
2020-09-21 12:58:49 -04:00
Nick Mathewson
e411360f6d
Merge branch 'maint-0.4.4'
2020-09-18 19:06:39 -04:00
Nick Mathewson
09813fe31e
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-09-18 19:06:16 -04:00
Nick Mathewson
b643ced022
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-18 19:06:16 -04:00
Nick Mathewson
0b77c706a1
Make debian-trace job conditional on src/lib/trace/trace_sys.c
2020-09-18 19:05:51 -04:00
Nick Mathewson
f8f3e57016
.gitlab.yml: missing comments
2020-09-18 15:55:06 -04:00
Nick Mathewson
122b297a20
Copy tracing things back to maint-0.3.5, for consistency.
2020-09-18 15:53:06 -04:00
Alexander Færøy
485990641b
Merge remote-tracking branch 'tor-gitlab/mr/137'
2020-09-18 14:51:54 +00:00
David Goulet
2e3603d96d
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-09-18 09:45:25 -04:00
David Goulet
2ddbfc64af
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-18 09:45:25 -04:00
David Goulet
e8a4482335
Merge branch 'maint-0.4.4'
2020-09-18 09:45:25 -04:00
Nick Mathewson
7945e075a4
Fix underflow in rend_cache/free_all test.
...
We already fixed these in #40099 and #40125 .
This patch fixes #40126 . Bugfix on 0.2.8.1-alpha.
2020-09-17 14:04:54 -04:00
Nick Mathewson
54cd2578ef
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-09-17 13:56:40 -04:00
Nick Mathewson
078194ecaf
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-17 13:56:40 -04:00
Nick Mathewson
404c224c71
Merge branch 'maint-0.4.4'
2020-09-17 13:56:40 -04:00
David Goulet
47f1d19f8e
test: Increment rend cache allocation before freeing
...
The rend_cache/entry_free was missing the rend cache allocation increment
before freeing the object.
Without it, it had an underflow bug:
Sep 17 08:40:13.845 [warn] rend_cache_decrement_allocation(): Bug: Underflow
in rend_cache_decrement_allocation (on Tor 0.4.5.0-alpha-dev
7eef9ced61
)
Fixes #40125
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-17 13:00:23 -04:00
David Goulet
a47d12c64d
Merge branch 'tor-gitlab/mr/129'
2020-09-17 09:17:53 -04:00
Nick Mathewson
4e8cb410a7
Resolve some coverity complaints in test_util_glob().
...
Coverity's first complaint was that we didn't check the return
values from chmod. That's easily fixed.
Coverity's second complaint was that there were code paths where we pass
NULL to chmod. For example, if this line failed, we'd "goto done",
and then pass NULL to chmod.
tt_ptr_op(dirname, OP_NE, NULL);
Closes #40103 . Bug not in any released Tor.
2020-09-17 09:17:49 -04:00
Nick Mathewson
5d1d7afcd3
Use the correct SIGNED_KEY_TYPE value for signing->link certs
...
Our code was using [01] as for the key type of signed->link certs,
which was incorrect. The value should be [03], to indicate that the
value as the SHA256 of an x.509 cert.
Fortunately, nothing cares about this value, so there shouldn't be
compatibility issues.
Fixes bug 40124; bugfix on 0.2.7.2-alpha.
2020-09-17 08:42:25 -04:00
David Goulet
7eef9ced61
Merge branch 'tor-gitlab/mr/131'
2020-09-17 08:33:10 -04:00
Nick Mathewson
22643272d2
Fix wide lines
2020-09-17 08:19:53 -04:00
Nick Mathewson
c92e19268b
Rename tor_cert_create to tor_cert_create_ed25519
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
tor_cert_create tor_cert_create_ed25519
It was generated with --no-verify, so it probably breaks some commit hooks.
The commiter should be sure to fix them up in a subsequent commit.
2020-09-17 08:17:36 -04:00
Nick Mathewson
ca389d22a1
Remove 0.4.2 from list of branches in git script: it has reached EOL.
2020-09-15 09:00:44 -04:00
Nick Mathewson
b30ac328c5
Merge branch 'maint-0.4.4'
...
"ours" to avoid version bump
2020-09-15 08:52:45 -04:00
Nick Mathewson
bf5bf33661
Bump version to 0.4.4.5-dev.
2020-09-15 08:52:37 -04:00
Nick Mathewson
9e2435c25f
Copy changelog and releasenotes for 0.4.4.5 to master.
2020-09-15 08:46:07 -04:00
Nick Mathewson
7d6986b6a4
Remove changes files that will appear in 0.4.4.5
2020-09-14 14:23:13 -04:00
Nick Mathewson
56583f96e9
Merge branch 'maint-0.4.4'
...
"ours" to avoid version bump.
2020-09-14 13:17:45 -04:00
Nick Mathewson
f6b8894726
Bump version to 0.4.4.5
2020-09-14 13:17:37 -04:00
Nick Mathewson
33380f6b27
Update remaining trac.tpo wiki urls
2020-09-14 11:02:38 -04:00
Alexander Færøy
1c4b140427
Check if glob() is available at build-time.
...
This patch disables the glob() support in the path library if glob() is
unavailable at build-time. This currently happens with the Android NDK
used for Tor Browser.
See: https://bugs.torproject.org/tpo/core/tor/40114
2020-09-10 10:51:57 -04:00