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
35,184 Commits 53 Branches 629 Tags 108 MiB
3334f63516
Commit Graph

35184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
afbf854ee1 Merge branch 'maint-0.4.3' 2020-03-13 16:57:42 -04:00
Nick Mathewson
a255ca9b12 Merge branch 'maint-0.4.2' into maint-0.4.3 
"ours" to avoid version bump.
 2020-03-13 16:57:27 -04:00
Nick Mathewson
2f4fa423c3 Merge branch 'maint-0.4.1' into maint-0.4.2 
"ours" to avoid version bump.
 2020-03-13 16:57:03 -04:00
Nick Mathewson
7a9e2a261b Merge branch 'maint-0.3.5' into maint-0.4.1 
"ours" to avoid version bump.
 2020-03-13 16:56:44 -04:00
Nick Mathewson
d17108a187 Bump to 0.3.5.10 2020-03-13 16:56:31 -04:00
Nick Mathewson
7f0ad3343e Bump to 0.4.1.9 2020-03-13 16:56:22 -04:00
Nick Mathewson
2c1a49c464 Bump to 0.4.2.7. 2020-03-13 16:56:06 -04:00
Nick Mathewson
87d01b0a90 Merge branch 'maint-0.4.3' 2020-03-13 16:46:16 -04:00
Nick Mathewson
938487d4b4 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-13 16:46:16 -04:00
Nick Mathewson
b2e543bfe7 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-13 16:46:16 -04:00
Nick Mathewson
6ed2c9e5fa Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-13 16:46:16 -04:00
Nick Mathewson
b9d71f3848 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 2020-03-13 16:46:09 -04:00
Nick Mathewson
3168b44857 Merge branch 'maint-0.4.3' 2020-03-13 16:45:26 -04:00
Nick Mathewson
f686631918 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-13 16:45:17 -04:00
Nick Mathewson
b504942331 Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2 2020-03-13 16:42:47 -04:00
teor
9cf7839df7
config: Improve some comments 
Document the namelen argument to port_cfg_new().

Fix a typo in a comment in port_cfg_line_extract_addrport().

Comment-only changes.
 2020-03-13 18:53:48 +10:00
teor
3b4303e7f6
Merge branch 'maint-0.4.3' 2020-03-13 13:01:31 +10:00
teor
dbadfe75e6
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3 2020-03-13 13:00:58 +10:00
teor
1d17541cfa
Merge branch 'pr1764_squashed' 2020-03-13 11:14:20 +10:00
Nick Mathewson
78c9ff7052
Add a script to install the scripts in scripts/git appropriately. 
To run this, say something like

   TOR_DEVTOOL_DIR=~/bin scripts/git/git-install-tools.sh all

To see what it would do, give it the -n flag.

To get help, give it the -h flag.
 2020-03-13 11:14:04 +10:00
Nick Mathewson
8bc4822ba6 Merge branch 'maint-0.4.3' 2020-03-12 13:45:06 -04:00
Nick Mathewson
3e42004e54 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 2020-03-12 13:42:42 -04:00
Nick Mathewson
8dc7ad1275 Fix unit tests that look at contactinfo logs. 2020-03-12 13:42:17 -04:00
Nick Mathewson
9ca7900e17 Merge branch 'maint-0.4.3' 2020-03-12 12:46:12 -04:00
Nick Mathewson
e03bb35f90 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 
Conflicts:
        src/app/config/config.c
 2020-03-12 12:45:56 -04:00
David Goulet
b755a489bd config: Warn if ContactInfo is not set 
Closes #33361

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-12 12:43:00 -04:00
David Goulet
df3f2bd9aa hs-v3: Log reasons why service can't upload descriptor 
When a service can not upload its descriptor(s), we have no logs on why. This
adds logging for each possible reason for each descriptors.

That logging is emitted every second so it is rate limited for each reason and
per descriptor.

Closes #33400

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-11 15:32:11 +02:00
David Goulet
894ff2dc84 dos: Pass transport name on new client connection 
For a bridge configured with a pluggable transport, the transport name is
used, with the IP address, for the GeoIP client cache entry.

However, the DoS subsystem was not aware of it and always passing NULL when
doing a lookup into the GeoIP cache.

This resulted in bridges with a PT are never able to apply DoS defenses for
newly created connections.

Fixes #33491

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-10 14:45:13 -04:00
Nick Mathewson
4c40cf4167 Merge branch 'maint-0.4.3' 
"ours" to avoid version bump.
 2020-03-10 10:29:14 -04:00
Nick Mathewson
f0646919af Bump to 0.4.3.3-alpha. 2020-03-10 10:28:09 -04:00
David Goulet
05aab3fd21 Merge branch 'maint-0.4.3' 2020-03-10 09:14:44 -04:00
rl1987
72550c18c8 Tweak double-underscore 2020-03-10 09:13:29 -04:00
rl1987
f89c32ccd0 Document poll_interval_tv in procmon.c 2020-03-10 09:13:22 -04:00
rl1987
94a2376e01 Document __OwningControllerProcess torrc option and mention polling interval 2020-03-10 09:13:19 -04:00
David Goulet
2d53168511 Merge branch 'tor-github/pr/1723' 2020-03-09 10:36:05 -04:00
David Goulet
6684c6e17f Merge branch 'tor-github/pr/1751' 2020-03-09 09:33:05 -04:00
Neel Chauhan
7d673e70b0 Remove the ClientAutoIPv6ORPort option 2020-03-09 09:33:00 -04:00
Nick Mathewson
8096f3b254 Revert "scripts: Remove typo in git-list-tor-branches.sh" 
This reverts commit a63b414822.

The "typo" wasn't actually a typo.  The "r" in the suffixes for the
release branches is meant to make them distinct from the maint
branches.

Now, _right now_, nothing uses release branch suffixes, but it's
important to keep them distinct if we decide to use them in the
future.
 2020-03-09 09:03:51 -04:00
Neel Chauhan
53e2292c05 Space out the line.key/line.value in test_policy_summary_helper_family_flags() 2020-03-08 17:12:28 -07:00
rl1987
437da7fb3a Fix allow_failures section 2020-03-06 19:45:03 +02:00
rl1987
dcb75f00e1 Disable parts of test_protover_all_supported() that cause fatal exceptions when ALL_BUGS_ARE_FATAL 2020-03-06 19:25:54 +02:00
rl1987
0732513f16 Also skip dir/purpose_needs_anonymity_returns_true_by_default when ALL_BUGS_ARE_FATAL 2020-03-06 19:25:54 +02:00
rl1987
159009ae47 Add changes file 2020-03-06 19:25:54 +02:00
rl1987
33f2de45e7 Try running some CI jobs with ALL_BUGS_ARE_FATAL 
Build Tor with ALL_BUGS_ARE_FATAL macro and run:
* make check
* make test-stem
* make test-network

These jobs are allowed to fail at this point.
 2020-03-06 19:25:54 +02:00
rl1987
3db65bc218 Skip test_new_route_len_unhandled_exit() when ALL_BUGS_ARE_FATAL 2020-03-06 17:55:21 +02:00
David Goulet
1da0b05a5c Merge commit 'ef991b04e26eb4db' 2020-03-05 10:52:59 -05:00
rl1987
ef991b04e2 Refrain from mentioning nicknames in manpage section for MyFamily. 
Also, fix a typo.
 2020-03-05 17:41:49 +02:00
David Goulet
a63b414822 scripts: Remove typo in git-list-tor-branches.sh 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-05 10:29:47 -05:00
David Goulet
a62e3e45e6 Merge branch 'tor-github/pr/1720' 2020-03-05 10:29:42 -05:00
Nick Mathewson
d9152b8a66 Update git scripts to use git-list-tor-branches.sh 2020-03-05 10:29:35 -05:00