]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agochanges file for ticket 33213
Taylor Yu [Mon, 10 Feb 2020 20:21:15 +0000 (14:21 -0600)] 
changes file for ticket 33213

6 years agogitlab-ci: purge old job for mirroring, its unused and obsolete
Hans-Christoph Steiner [Tue, 10 Sep 2019 22:00:10 +0000 (00:00 +0200)] 
gitlab-ci: purge old job for mirroring, its unused and obsolete

6 years agoMerge branch 'tor-github/pr/1456'
George Kadianakis [Tue, 29 Oct 2019 13:29:13 +0000 (21:29 +0800)] 
Merge branch 'tor-github/pr/1456'

6 years agoapp/config: Fix a comment typo in config.c
teor [Tue, 29 Oct 2019 02:40:20 +0000 (12:40 +1000)] 
app/config: Fix a comment typo in config.c

The options validation is now a callback.

Bugfix on 31241; not in any released version of tor.

6 years agoMerge branch 'maint-0.4.2'
teor [Mon, 28 Oct 2019 22:27:02 +0000 (08:27 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Mon, 28 Oct 2019 22:26:55 +0000 (08:26 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
teor [Mon, 28 Oct 2019 22:26:48 +0000 (08:26 +1000)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Mon, 28 Oct 2019 22:26:40 +0000 (08:26 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
teor [Mon, 28 Oct 2019 22:26:32 +0000 (08:26 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
teor [Mon, 28 Oct 2019 22:23:35 +0000 (08:23 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9

6 years agonodelist: fix a comment typo in routerset.h
teor [Mon, 28 Oct 2019 13:44:08 +0000 (23:44 +1000)] 
nodelist: fix a comment typo in routerset.h

6 years agoMerge branch 'tor-github/pr/1476'
David Goulet [Mon, 28 Oct 2019 12:47:57 +0000 (08:47 -0400)] 
Merge branch 'tor-github/pr/1476'

6 years agoadd missing docs in crypto_digest*
Nick Mathewson [Mon, 28 Oct 2019 12:27:42 +0000 (08:27 -0400)] 
add missing docs in crypto_digest*

6 years agoMerge branch 'config_macros_doc_cleanup'
Nick Mathewson [Mon, 28 Oct 2019 11:31:42 +0000 (07:31 -0400)] 
Merge branch 'config_macros_doc_cleanup'

6 years agoscripts: Change to the top source directory as needed
teor [Mon, 28 Oct 2019 03:28:50 +0000 (13:28 +1000)] 
scripts: Change to the top source directory as needed

Bugfix on 31919; not in any released version of tor.

6 years agopractracker: Don't read editor temp files
teor [Mon, 28 Oct 2019 03:09:58 +0000 (13:09 +1000)] 
practracker: Don't read editor temp files

(Or any dot files.)

Obviously correct changes to already-reviewed code.

6 years agoscripts/git: Fix a shellcheck error in pre-commit.git-hook
teor [Mon, 28 Oct 2019 03:04:29 +0000 (13:04 +1000)] 
scripts/git: Fix a shellcheck error in pre-commit.git-hook

Some versions of shellcheck do not detect this error.

Bugfix on 31919; not in any released version of tor.

6 years agoDocumentation cleanup in confmacros.h
Nick Mathewson [Sat, 26 Oct 2019 21:21:18 +0000 (17:21 -0400)] 
Documentation cleanup in confmacros.h

6 years agoChanges file for ticket 32307.
Nick Mathewson [Sat, 26 Oct 2019 16:09:09 +0000 (12:09 -0400)] 
Changes file for ticket 32307.

6 years agoFix doxygen HTML warnings in src/feature.
Nick Mathewson [Sat, 26 Oct 2019 16:07:09 +0000 (12:07 -0400)] 
Fix doxygen HTML warnings in src/feature.

6 years agodoxygen: add @file declarations for src/feature/
Nick Mathewson [Sat, 26 Oct 2019 16:05:28 +0000 (12:05 -0400)] 
doxygen: add @file declarations for src/feature/

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

6 years agodoxygen: add @file declarations for src/app
Nick Mathewson [Sat, 26 Oct 2019 15:13:29 +0000 (11:13 -0400)] 
doxygen: add @file declarations for src/app

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

6 years agodoxygen: add @file declarations for src/core/crypto
Nick Mathewson [Sat, 26 Oct 2019 15:13:29 +0000 (11:13 -0400)] 
doxygen: add @file declarations for src/core/crypto

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

6 years agodoxygen: add @file declarations for src/core/or
Nick Mathewson [Sat, 26 Oct 2019 15:13:29 +0000 (11:13 -0400)] 
doxygen: add @file declarations for src/core/or

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

6 years agodoxygen: add @file declarations for src/core/mainloop
Nick Mathewson [Sat, 26 Oct 2019 15:13:29 +0000 (11:13 -0400)] 
doxygen: add @file declarations for src/core/mainloop

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

6 years agodoxygen: add @file declarations for src/core/proto
Nick Mathewson [Sat, 26 Oct 2019 15:13:29 +0000 (11:13 -0400)] 
doxygen: add @file declarations for src/core/proto

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

These declarations also turned up a doxygen warning for
proto_socks.c; I fixed that too.

6 years agodoxygen: add @file declarations for src/lib
Nick Mathewson [Sat, 26 Oct 2019 15:13:29 +0000 (11:13 -0400)] 
doxygen: add @file declarations for src/lib

If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.

These declarations also turned up a doxygen warning for
crypto_ope.c; I fixed that too.

6 years agochanges file for 32304
Nick Mathewson [Sat, 26 Oct 2019 14:14:05 +0000 (10:14 -0400)] 
changes file for 32304

6 years agoRename confparse.[ch] identifiers to confmgt.[ch] identifiers.
Nick Mathewson [Sat, 26 Oct 2019 14:09:03 +0000 (10:09 -0400)] 
Rename confparse.[ch] identifiers to confmgt.[ch] identifiers.

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        confparse.h confmgt.h \
        confparse.c confmgt.c \
        CONFPARSE_PRIVATE CONFMGT_PRIVATE \
        TOR_CONFPARSE_H TOR_CONFMGT_H

6 years agoRename confparse.[ch] to confmgt.[ch]
Nick Mathewson [Sat, 26 Oct 2019 14:07:14 +0000 (10:07 -0400)] 
Rename confparse.[ch] to confmgt.[ch]

This will break compilation until includes etc are fixed.

6 years agoMove config_format_t and allied definitions into conftypes.h
Nick Mathewson [Sat, 26 Oct 2019 14:05:03 +0000 (10:05 -0400)] 
Move config_format_t and allied definitions into conftypes.h

Since these are needed by every module that is _configurable_, they
belong in lib/conf, not lib/confmgt.

6 years agoMerge branch 'ticket31241_v3'
Nick Mathewson [Fri, 25 Oct 2019 12:10:39 +0000 (08:10 -0400)] 
Merge branch 'ticket31241_v3'

6 years agoconfig,state: check magic in all callbacks.
Nick Mathewson [Fri, 25 Oct 2019 12:09:05 +0000 (08:09 -0400)] 
config,state: check magic in all callbacks.

6 years agoconfparse: Add a function to check the magic of a toplevel object.
Nick Mathewson [Fri, 25 Oct 2019 12:08:43 +0000 (08:08 -0400)] 
confparse: Add a function to check the magic of a toplevel object.

6 years agotest: Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes
teor [Fri, 25 Oct 2019 07:23:46 +0000 (17:23 +1000)] 
test: Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes

In the unit tests.

Fixes a regression to bug 31334; bug not in any released version of tor.

6 years agoMerge remote-tracking branch 'tor-github/pr/1467'
teor [Fri, 25 Oct 2019 07:17:39 +0000 (17:17 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1467'

6 years agoscripts/maint: Stop assuming that python3 is in /usr/bin
teor [Fri, 25 Oct 2019 06:46:54 +0000 (16:46 +1000)] 
scripts/maint: Stop assuming that python3 is in /usr/bin

Obviously correct fix to rename_c_identifier.py.

Bugfix on 32237; not in any released version of tor.

6 years agoMerge remote-tracking branch 'tor-github/pr/1462'
teor [Fri, 25 Oct 2019 06:14:37 +0000 (16:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1462'

6 years agoMakefile: Stop using trailing spaces in an EXTRA_DIST clause
teor [Fri, 25 Oct 2019 06:13:16 +0000 (16:13 +1000)] 
Makefile: Stop using trailing spaces in an EXTRA_DIST clause

Based on 8-space tabs, the git/less default.

Cleanup after 31919.

6 years agochanges: file for 31919
teor [Wed, 23 Oct 2019 23:48:37 +0000 (09:48 +1000)] 
changes: file for 31919

6 years agoTravis: Install coccinelle on macOS and Linux
teor [Wed, 23 Oct 2019 03:49:50 +0000 (13:49 +1000)] 
Travis: Install coccinelle on macOS and Linux

And print the spatch version and build details

Part of 31919.

6 years agoMakefile: Add check_cocci_parse.sh as check-cocci
teor [Wed, 23 Oct 2019 05:44:17 +0000 (15:44 +1000)] 
Makefile: Add check_cocci_parse.sh as check-cocci

And add it to check-local.

Part of 31919.

6 years agoMerge branch 'maint-0.4.2'
teor [Fri, 25 Oct 2019 00:56:21 +0000 (10:56 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Fri, 25 Oct 2019 00:56:13 +0000 (10:56 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
teor [Fri, 25 Oct 2019 00:56:06 +0000 (10:56 +1000)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 25 Oct 2019 00:55:58 +0000 (10:55 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
teor [Fri, 25 Oct 2019 00:55:51 +0000 (10:55 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoMerge branch 'maint-0.4.2'
teor [Fri, 25 Oct 2019 00:38:22 +0000 (10:38 +1000)] 
Merge branch 'maint-0.4.2'

6 years agochanges tile for ticket 31241
Nick Mathewson [Fri, 25 Oct 2019 00:25:36 +0000 (20:25 -0400)] 
changes tile for ticket 31241

6 years agotest_options: add a test for options_trial_assign()
Nick Mathewson [Fri, 25 Oct 2019 00:23:30 +0000 (20:23 -0400)] 
test_options: add a test for options_trial_assign()

This function is used by controllers to set options.  I refactored
it a bit when refactoring options validation, so it needs to get
tested.

6 years agotests: set DataDirectory_option as well as DataDirectory.
Nick Mathewson [Fri, 25 Oct 2019 00:16:44 +0000 (20:16 -0400)] 
tests: set DataDirectory_option as well as DataDirectory.

options_validate_cb() derives DataDirectory (which we use) from
DataDirectory_option (which the user sets).  I want to add a test
that will call options_validate_cb(), but it will fail unless it
derives the same value.

6 years agoconfig: make options_act*() mockable.
Nick Mathewson [Fri, 25 Oct 2019 00:16:10 +0000 (20:16 -0400)] 
config: make options_act*() mockable.

I'll need this for testing options_trial_assign().

6 years agoMerge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2
teor [Fri, 25 Oct 2019 00:38:01 +0000 (10:38 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2

6 years agoExtend confmgr tests to handle validation callbacks.
Nick Mathewson [Thu, 24 Oct 2019 21:35:15 +0000 (17:35 -0400)] 
Extend confmgr tests to handle validation callbacks.

6 years agoconfig.c: Turn options_transition_allowed() into a proper callback
Nick Mathewson [Thu, 24 Oct 2019 13:16:50 +0000 (09:16 -0400)] 
config.c: Turn options_transition_allowed() into a proper callback

6 years agoconfig.c: extract validate, check-transition, and set into a function
Nick Mathewson [Thu, 24 Oct 2019 13:08:17 +0000 (09:08 -0400)] 
config.c: extract validate, check-transition, and set into a function

This eliminates duplicated code.  The options_validate() function
itself is now tests-only.

6 years agoWrite a new set of config validation callbacks.
Nick Mathewson [Wed, 23 Oct 2019 20:00:25 +0000 (16:00 -0400)] 
Write a new set of config validation callbacks.

Unlike legacy_validate_fn_t, these callbacks have separation of
duties, into:

    * early normalization and computation.
    * validation
    * transition checking
    * late normalization and computation

Only the first and last steps get mutable objects.  Only the
transition-checking step gets to see the previous values of this
object.

6 years agoMake foo_validate() functions call config_validate().
Nick Mathewson [Wed, 23 Oct 2019 19:38:15 +0000 (15:38 -0400)] 
Make foo_validate() functions call config_validate().

The former foo_validate() functions are now toplevel
legacy_validate_fn callbacks.  The new foo_validate() functions now
call them.

This change lets us remove the old shared_random disk state
validation callback entirely.

6 years agoAdd a config_validate() function to invoke verify callbacks.
Nick Mathewson [Wed, 23 Oct 2019 19:12:19 +0000 (15:12 -0400)] 
Add a config_validate() function to invoke verify callbacks.

As we turn our monolithic configuration objects into suites of
smaller module-specific configuration objects, we will want each one
to be able to provide its own verification callbacks.  That means
that instead of invoking these verification callbacks directly, we will
want to call them via the configuration manager object.

6 years agoRename validate_fn{,_t} to start with "legacy_".
Nick Mathewson [Wed, 23 Oct 2019 18:39:20 +0000 (14:39 -0400)] 
Rename validate_fn{,_t} to start with "legacy_".

The current API of this callback mixes responsibilities, including:
  * validation
  * transition checking
  * processing (modifying) the configuration object.

These will have to be disentangled piece by piece, so for now, we'll
have "legacy" validate functions as well.

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        validate_fn_t legacy_validate_fn_t \
        validate_fn legacy_validate_fn

6 years agotest_options: stop generating old_data entirely.
Nick Mathewson [Wed, 23 Oct 2019 22:03:24 +0000 (18:03 -0400)] 
test_options: stop generating old_data entirely.

Now that we no longer use it anywhere, we can remove this variable
from the test data structure.

6 years agotest_options: don't pass an old_options argument to options_validate()
Nick Mathewson [Wed, 23 Oct 2019 21:52:48 +0000 (17:52 -0400)] 
test_options: don't pass an old_options argument to options_validate()

This input was inessential, and none of the tests actually depended
on it or tested anything about it (as can be seen from the fact that
tests all still pass when it's removed).

I tried to generate this commit with a coccinelle script, but it had
trouble parsing a lot of options_validate as it stands.  Instead, I
did a search-and-replace to replace "tdata->old_opt," with "NULL,".

6 years agoUse named-member syntax for initializing config_format_t objects
Nick Mathewson [Thu, 25 Jul 2019 13:43:50 +0000 (09:43 -0400)] 
Use named-member syntax for initializing config_format_t objects

I'm about to mess with their lists of callbacks, and I don't want to
proliferate lists where we say "NULL, NULL, NULL, ..."

6 years agoMerge remote-tracking branch 'tor-github/pr/1463'
teor [Fri, 25 Oct 2019 00:27:41 +0000 (10:27 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1463'

6 years agochanges: file for 31919's bionic Travis image change
teor [Thu, 24 Oct 2019 23:53:11 +0000 (09:53 +1000)] 
changes: file for 31919's bionic Travis image change

6 years agoMerge branch 'ticket31919_bionic_029' into ticket31919_bionic_035
teor [Thu, 24 Oct 2019 23:48:14 +0000 (09:48 +1000)] 
Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035

6 years agoTravis: Use Ubuntu Bionic, but keep Trusty for chutney
teor [Wed, 23 Oct 2019 12:31:05 +0000 (22:31 +1000)] 
Travis: Use Ubuntu Bionic, but keep Trusty for chutney

Bionic has a recent coccinelle version, which passes our CI tests.

But Bionic (and Xenial) cause permissions errors for chutney.
We'll fix those in 32240.

Part of 31919.

6 years agoMerge branch 'maint-0.4.2'
teor [Thu, 24 Oct 2019 23:42:14 +0000 (09:42 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2
teor [Thu, 24 Oct 2019 23:41:48 +0000 (09:41 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2

6 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Thu, 24 Oct 2019 19:55:38 +0000 (15:55 -0400)] 
Merge branch 'maint-0.4.2'

"ours" to avoid version bump.

6 years agobump to 0.4.2.3-alpha-dev
Nick Mathewson [Thu, 24 Oct 2019 19:55:22 +0000 (15:55 -0400)] 
bump to 0.4.2.3-alpha-dev

6 years agoForward-port the changelog for 0.4.2.3-alpha
Nick Mathewson [Thu, 24 Oct 2019 19:52:55 +0000 (15:52 -0400)] 
Forward-port the changelog for 0.4.2.3-alpha

6 years agotest_options: Use 64-bit comparisons when checking domain masks.
Nick Mathewson [Thu, 24 Oct 2019 16:37:27 +0000 (12:37 -0400)] 
test_options: Use 64-bit comparisons when checking domain masks.

This prevents a warning when building for 32-bit targets.

Fixes bug 32269; bug not in any released Tor.

6 years agoA little more text in the SEE ALSO section.
Nick Mathewson [Thu, 24 Oct 2019 15:45:07 +0000 (11:45 -0400)] 
A little more text in the SEE ALSO section.

6 years agoMerge remote-tracking branch 'tor-github/pr/1437'
Nick Mathewson [Thu, 24 Oct 2019 15:44:19 +0000 (11:44 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1437'

6 years agodir: Return 503 code when rejecting single hop request
David Goulet [Thu, 24 Oct 2019 15:25:05 +0000 (11:25 -0400)] 
dir: Return 503 code when rejecting single hop request

Single hop rejection (POST and GET) for HS v3 descriptor now return a 503 code
which is more accurate code from dir-spec.txt and from other rejection case in
the code.

For instance if you are not a relay and you get a POST request, a 503 code is
sent back with a rejection message.

Part of #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agodir: Remove connection_dir_is_anonymous() logging
David Goulet [Thu, 24 Oct 2019 15:23:31 +0000 (11:23 -0400)] 
dir: Remove connection_dir_is_anonymous() logging

First, remove the HSDir mention which should not be in that generic function.
Second, move them to debug() level since they are possible error case.

Part of #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agodir: Look if circuit is closed in connection_dir_is_anonymous()
David Goulet [Thu, 24 Oct 2019 15:08:25 +0000 (11:08 -0400)] 
dir: Look if circuit is closed in connection_dir_is_anonymous()

Before inspecting the p_chan, we must check if the circuit is marked for close
because if it is the case, the channels are nullified from the circuit.

Several valid cases can mark the circuit for close of the directory
connection.

Fixes #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoconfigure: Add --disable-module-relay to summary
David Goulet [Thu, 24 Oct 2019 13:08:36 +0000 (09:08 -0400)] 
configure: Add --disable-module-relay to summary

Closes #32266

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agohs-v3: Remove a BUG() caused by an acceptable race
David Goulet [Wed, 23 Oct 2019 14:20:09 +0000 (10:20 -0400)] 
hs-v3: Remove a BUG() caused by an acceptable race

hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor
from the client cache with a NEWNYM or simply when the descriptor expires.

Which means that for an INTRO circuit being established during that time, once
it opens, we lookup the descriptor to get the IP object but hey surprised, no
more descriptor.

The approach here is minimalist that is accept the race and close the circuit
since we can not continue. Before that, the circuit would stay opened and the
client wait the SockTimeout.

Fixers #28970.

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoAdd a script to rename C identifiers, and optionally add a commit message
Nick Mathewson [Wed, 23 Oct 2019 17:26:08 +0000 (13:26 -0400)] 
Add a script to rename C identifiers, and optionally add a commit message

This script should "pay for itself" if it prevents one bug caused by
careless search-replace-commit loops.

6 years agoscripts/git: Make spaces consistent in pre-push.git-hook
teor [Thu, 24 Oct 2019 04:03:48 +0000 (14:03 +1000)] 
scripts/git: Make spaces consistent in pre-push.git-hook

Part of 31919.

6 years agoscripts/git: Only check modified files in existing git hook checks
teor [Thu, 24 Oct 2019 03:59:02 +0000 (13:59 +1000)] 
scripts/git: Only check modified files in existing git hook checks

Part of 31919.

6 years agoscripts/git: Add check_cocci_parse.sh to the pre-commit hook
teor [Wed, 23 Oct 2019 05:43:27 +0000 (15:43 +1000)] 
scripts/git: Add check_cocci_parse.sh to the pre-commit hook

But only check modified files, which dramatically speeds up
check_cocci_parse.sh.

Part of 31919.

6 years agoscripts/cocci: Check owned src in check_cocci_parse.sh by default
teor [Wed, 23 Oct 2019 12:17:37 +0000 (22:17 +1000)] 
scripts/cocci: Check owned src in check_cocci_parse.sh by default

Check the tor-owned sources in an 0.3.5 directory layout, if no
files are provided on the command line.

Part of 31919.

6 years agoTravis: Use macOS 10.14 with Xcode 11.2
teor [Wed, 23 Oct 2019 12:41:17 +0000 (22:41 +1000)] 
Travis: Use macOS 10.14 with Xcode 11.2

Closes ticket 32241.

6 years agoscripts/cocci: Add check_cocci_parse.sh and default exceptions
teor [Wed, 23 Oct 2019 05:40:09 +0000 (15:40 +1000)] 
scripts/cocci: Add check_cocci_parse.sh and default exceptions

Add check_cocci_parse.sh, which is a thin wrapper around
try_parse.sh. Add a default exceptions file, and use it in
check_cocci_parse.sh.

Part of 31919.

6 years agoscripts/cocci: Remove unused arguments from try_parse.sh spatch
teor [Thu, 24 Oct 2019 01:34:28 +0000 (11:34 +1000)] 
scripts/cocci: Remove unused arguments from try_parse.sh spatch

Part of 31919.

6 years agoscripts/cocci: Add an exceptions file to try_parse.sh
teor [Wed, 23 Oct 2019 05:37:20 +0000 (15:37 +1000)] 
scripts/cocci: Add an exceptions file to try_parse.sh

Set $TOR_COCCI_EXCEPTIONS_FILE to the name of an exceptions file,
containing a list of filename patterns matched by 'grep -f'.

Part of 31919.

6 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Thu, 24 Oct 2019 00:26:15 +0000 (20:26 -0400)] 
Merge branch 'maint-0.4.2'

"ours" to avoid version bump.

6 years agoBump to 0.4.2.3-alpha
Nick Mathewson [Thu, 24 Oct 2019 00:25:34 +0000 (20:25 -0400)] 
Bump to 0.4.2.3-alpha

6 years agoMerge remote-tracking branch 'tor-github/pr/1447'
teor [Thu, 24 Oct 2019 00:00:47 +0000 (10:00 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1447'

6 years agohs-v3: Remove the circuit_established intro flag
David Goulet [Wed, 23 Oct 2019 15:37:33 +0000 (11:37 -0400)] 
hs-v3: Remove the circuit_established intro flag

Only use the HS circuit map to know if an introduction circuit is established
or not. No need for a flag to keep state of something we already have in the
circuit map. Furthermore, the circuit map gets cleaned up properly so it will
always have the "latest truth".

This commit also removes a unit test that was testing specifically that flag
but now we rely solely on the HS circuit map which is also tested few lines
below the removed test.

Fixes #32094

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1451'
David Goulet [Wed, 23 Oct 2019 13:11:43 +0000 (09:11 -0400)] 
Merge branch 'tor-github/pr/1451'

6 years agoMerge remote-tracking branch 'tor-github/pr/1449'
teor [Wed, 23 Oct 2019 12:59:16 +0000 (22:59 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1449'

6 years agochanges: file for 32216
teor [Wed, 23 Oct 2019 03:36:39 +0000 (13:36 +1000)] 
changes: file for 32216

6 years agoscripts/git: Avoid sleeping before the last push in git-push-all.sh
teor [Wed, 23 Oct 2019 03:28:37 +0000 (13:28 +1000)] 
scripts/git: Avoid sleeping before the last push in git-push-all.sh

Change the loop order, so that we only sleep between pushes,
and avoid sleeping after all the pushes are done.

(In rare cases, there may still be an extra sleep.)

Part of 32216.

6 years agoscripts/git: Make git-push-all.sh skip more branches that match upstream
teor [Wed, 23 Oct 2019 03:26:07 +0000 (13:26 +1000)] 
scripts/git: Make git-push-all.sh skip more branches that match upstream

The script now skips master, maint-* and release-* branches that match
upstream, not just test branches.

And fix "no branches" bugs that this change makes happen more often.

Part of 32216.

6 years agoscripts/git: Pass all unrecognised arguments to git-push-all.sh
teor [Wed, 23 Oct 2019 02:58:15 +0000 (12:58 +1000)] 
scripts/git: Pass all unrecognised arguments to git-push-all.sh

This makes the behaviour of git-push-all.sh -n identical to the other
git scripts.

Part of 32216.

6 years agoscripts/git: Fix a variable name typo in git-push-all.sh
teor [Wed, 23 Oct 2019 03:00:35 +0000 (13:00 +1000)] 
scripts/git: Fix a variable name typo in git-push-all.sh

Obviously correct changes to already reviewed code.