nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,304 Commits 53 Branches 629 Tags 108 MiB
ef5d1e6b65
Commit Graph

33304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Kadianakis
3b32f2508c Merge branch 'tor-github/pr/1307' 2019-09-11 16:19:21 +03:00
Nick Mathewson
e7565855c0 Merge branch 'ticket31578' into ticket31578_merged 2019-09-11 08:59:29 -04:00
teor
39c7f46d36
main: add some newlines to the subsystem list, for readability 2019-09-10 09:06:36 +10:00
teor
5fa75a6cd4
main: remove level number comments from the subsystem list (master) 
Part of 31615.
 2019-09-10 09:04:38 +10:00
teor
987768b077
Merge branch 'bug31615_041' into bug31615_master 
Merged modified lines from bug31615_041, and unmodified lines
from master.
 2019-09-10 09:03:37 +10:00
teor
f1c57cd1e5
main: remove level number comments from the subsystem list (0.4.1) 
Part of 31615.
 2019-09-10 08:44:35 +10:00
teor
7e22d99346
Merge branch 'bug31615_040' into bug31615_041 
Merged modified lines from bug31615_040, and unmodified lines
from maint-0.4.1.
 2019-09-10 08:43:13 +10:00
teor
2e2a35b694 main: remove level number comments from the subsystem list (0.4.0) 
These levels get out of date really easily: we'll implement a level
dump command in tor in 31614.

They also cause conflicts and inconsistencies when merging forward
level changes.

Part of 31615.
 2019-09-10 08:35:56 +10:00
David Goulet
409df19b5a build: The <sys/sysctl.h> is now deprecated on Linux 
Closes #31673
 2019-09-09 17:07:08 -04:00
David Goulet
796a9b37ea Merge branch 'tor-github/pr/1264' 2019-09-09 14:53:12 -04: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
teor
612b0a4139 subsys: Make the subsystem init order match the module dependencies 
Fix levels for subsystems that depend on log/err
* winprocess (security) doesn't use err:
  * call windows process security APIs as early as possible
  * init err after winprocess
  * move wallclock so it's still after err
* network and time depend on log:
  * make sure that network and time can use logging.
  * init network and time after log

Add comments explaining the module init order.

Fixes bug 31615; bugfix on 0.4.0.1-alpha.
 2019-09-06 16:58:53 +10:00
Nick Mathewson
380d178e53 changes file for ticket31477 2019-09-05 16:20:31 -04:00
Nick Mathewson
884ae485f6 Add new practracker test files to Makefile.am 2019-09-05 16:17:50 -04:00
Nick Mathewson
bc4ddbf4ac New practracker exceptions for dependency violations in headers 
I've done this manually, since I don't want to override the existing
exceptions in this branch.
 2019-09-05 16:17:50 -04:00
Nick Mathewson
318de94e49 Fix a bug in practracker's handling of .may_include in headers 
I was expecting our filter code to work in a way it didn't.  I
thought that saying that DependencyViolation applied to "*" would
hit all of the files -- but actually, "*" wasn't implemented.  I had
to say "*.c" and "*.h"
 2019-09-05 16:16:20 -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
Nick Mathewson
16cf9424c1 config: Invert sense of _is_invisible, and rename to is_listable() 2019-09-05 11:32:32 -04:00
Nick Mathewson
22e7d33735 config: replace config_var_is_cumulative with is_replaced_on_set() 
This change replaces the higher-level property check to match our
intended flag factoring.
 2019-09-05 11:32:32 -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