]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agoclean up kvline_can_encode_lines()
Taylor Yu [Wed, 3 Jul 2019 20:13:51 +0000 (15:13 -0500)] 
clean up kvline_can_encode_lines()

Add a check for '=' characters in needs_escape().  This simplifies the
logic in kvline_can_encode_lines().

Part of #30984.

6 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Fri, 6 Dec 2019 21:02:08 +0000 (16:02 -0500)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 6 Dec 2019 21:02:08 +0000 (16:02 -0500)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Fri, 6 Dec 2019 21:02:08 +0000 (16:02 -0500)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Fri, 6 Dec 2019 21:02:07 +0000 (16:02 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
Nick Mathewson [Fri, 6 Dec 2019 21:02:07 +0000 (16:02 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoUpdate geoip and geoip6 to the December 3 2019 database.
Karsten Loesing [Fri, 6 Dec 2019 10:50:35 +0000 (11:50 +0100)] 
Update geoip and geoip6 to the December 3 2019 database.

6 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Thu, 5 Dec 2019 18:32:40 +0000 (13:32 -0500)] 
Merge branch 'maint-0.4.2'

"ours" to avoid version bump.

6 years agoBump to 0.4.2.5
Nick Mathewson [Thu, 5 Dec 2019 18:32:30 +0000 (13:32 -0500)] 
Bump to 0.4.2.5

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Thu, 5 Dec 2019 18:32:06 +0000 (13:32 -0500)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

6 years agobump version to 0.4.1.7
Nick Mathewson [Thu, 5 Dec 2019 18:31:46 +0000 (13:31 -0500)] 
bump version to 0.4.1.7

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Thu, 5 Dec 2019 18:31:17 +0000 (13:31 -0500)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.

6 years agoBump to 0.4.0.6
Nick Mathewson [Thu, 5 Dec 2019 18:31:01 +0000 (13:31 -0500)] 
Bump to 0.4.0.6

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Thu, 5 Dec 2019 18:30:32 +0000 (13:30 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.

6 years agoBump version to 0.3.5.9
Nick Mathewson [Thu, 5 Dec 2019 18:29:49 +0000 (13:29 -0500)] 
Bump version to 0.3.5.9

6 years agoRemove changes files that are scheduled for inclusion in 0.4.2.5
Nick Mathewson [Thu, 5 Dec 2019 18:27:46 +0000 (13:27 -0500)] 
Remove changes files that are scheduled for inclusion in 0.4.2.5

6 years agoAdd a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687
Nick Mathewson [Thu, 5 Dec 2019 17:52:30 +0000 (12:52 -0500)] 
Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687

6 years agoMerge branch 'maint-0.4.2'
teor [Thu, 5 Dec 2019 00:14:16 +0000 (10:14 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Thu, 5 Dec 2019 00:14:08 +0000 (10:14 +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 [Thu, 5 Dec 2019 00:14:01 +0000 (10:14 +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 [Thu, 5 Dec 2019 00:13:53 +0000 (10:13 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
teor [Thu, 5 Dec 2019 00:13:15 +0000 (10:13 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
teor [Thu, 5 Dec 2019 00:11:18 +0000 (10:11 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5

6 years agoSplit a few long lists in Makefiles.
Nick Mathewson [Wed, 4 Dec 2019 17:21:53 +0000 (12:21 -0500)] 
Split a few long lists in Makefiles.

6 years agoMerge branch 'ticket32609_squashed'
Nick Mathewson [Wed, 4 Dec 2019 17:15:28 +0000 (12:15 -0500)] 
Merge branch 'ticket32609_squashed'

6 years agopractracker: Add missing .may_include files
teor [Tue, 3 Dec 2019 03:29:19 +0000 (13:29 +1000)] 
practracker: Add missing .may_include files

All of these files contain "*.h", except for:
* src/app/config/.may_include
* src/test/.may_include
which also contain "*.inc".

This change prevents includes of "*.c" files, and other
unusually named files.

Part of 32609.

6 years agopractracker: document !advisory in includes.py
teor [Tue, 3 Dec 2019 03:28:55 +0000 (13:28 +1000)] 
practracker: document !advisory in includes.py

6 years agogit scripts: Add the checkSpace.pl unit tests
teor [Tue, 3 Dec 2019 03:06:30 +0000 (13:06 +1000)] 
git scripts: Add the checkSpace.pl unit tests

Extra testing after 32613.

6 years agopractracker: Test for bad ".c" includes in the unit tests
teor [Sat, 16 Nov 2019 11:45:52 +0000 (21:45 +1000)] 
practracker: Test for bad ".c" includes in the unit tests

Part of 32522.

6 years agoMakefile/git scripts: Add the practracker unit tests
teor [Sat, 16 Nov 2019 11:44:44 +0000 (21:44 +1000)] 
Makefile/git scripts: Add the practracker unit tests

Add a check-practracker-unit-test target, and run it as part of
"make check".

Add the practracker unit tests to scripts/git/pre-commit.git-hook.

Part of 32609.

6 years agocontrol-port: Include HS address in ONION_CLIENT_AUTH_VIEW reply.
George Kadianakis [Wed, 4 Dec 2019 11:33:07 +0000 (13:33 +0200)] 
control-port: Include HS address in ONION_CLIENT_AUTH_VIEW reply.

6 years agohs-v3: Fix NULL deref. in hs_circ_service_get_established_intro_circ()
David Goulet [Tue, 3 Dec 2019 15:11:42 +0000 (10:11 -0500)] 
hs-v3: Fix NULL deref. in hs_circ_service_get_established_intro_circ()

Found by Stem regression tests. Reported by atagar.

Fixes #32664

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1563'
David Goulet [Tue, 3 Dec 2019 14:22:21 +0000 (09:22 -0500)] 
Merge branch 'tor-github/pr/1563'

6 years agohsv3: ONION_CLIENT_AUTH_REMOVE now also removes the credential file.
George Kadianakis [Mon, 25 Nov 2019 16:31:29 +0000 (18:31 +0200)] 
hsv3: ONION_CLIENT_AUTH_REMOVE now also removes the credential file.

6 years agohsv3: Abstract parts of hs_config_client_authorization() into func.
George Kadianakis [Mon, 25 Nov 2019 16:03:53 +0000 (18:03 +0200)] 
hsv3: Abstract parts of hs_config_client_authorization() into func.

Now we have a function that reads a file and returns a credential. We need that
for the REMOVE control port command.

6 years agohsv3: Start refactoring hs_config_client_authorization().
George Kadianakis [Mon, 25 Nov 2019 15:40:22 +0000 (17:40 +0200)] 
hsv3: Start refactoring hs_config_client_authorization().

- Remove key_dir which is useless.
- Kill an indentation layer.

We want to make it cleaner and slimmer so that we can reuse parts of it in the
REMOVE command for removing the right client auth file.

6 years agohsv3: Remove support for client auth nicknames.
George Kadianakis [Mon, 25 Nov 2019 15:22:52 +0000 (17:22 +0200)] 
hsv3: Remove support for client auth nicknames.

Because the function that parses client auth credentials saved on
disk (parse_auth_file_content()) is not future compatible, there is no way to
add support for storing the nickname on the disk. Hence, nicknames cannot
persist after Tor restart making them pretty much useless.

In the future we can introduce nicknames by adding a new file format for client
auth credentials, but this was not deemed worth doing at this stage.

6 years agohsv3: Add tests for permanently storing auth credentials.
George Kadianakis [Mon, 25 Nov 2019 13:55:47 +0000 (15:55 +0200)] 
hsv3: Add tests for permanently storing auth credentials.

Remove Permanent flag from old tests, and make a new test that does all the
permanent things.

6 years agohsv3: Implement permanent storage of auth credentials.
George Kadianakis [Mon, 25 Nov 2019 13:55:12 +0000 (15:55 +0200)] 
hsv3: Implement permanent storage of auth credentials.

- See hs_client_register_auth_credentials() for the entry point.
- Also set the permanent flag for credentials we read from the filesystem.
- Also add some missing documentation.

6 years agoMerge branch 'pr-1569-squashed'
teor [Tue, 3 Dec 2019 02:57:06 +0000 (12:57 +1000)] 
Merge branch 'pr-1569-squashed'

6 years agoDistribute checkSpaceTest.sh and run it when we have perl.
Nick Mathewson [Mon, 2 Dec 2019 17:43:10 +0000 (12:43 -0500)] 
Distribute checkSpaceTest.sh and run it when we have perl.

6 years agoHave checkSpaceTest.sh exit as skipped when on Windows
Nick Mathewson [Mon, 2 Dec 2019 17:43:10 +0000 (12:43 -0500)] 
Have checkSpaceTest.sh exit as skipped when on Windows

Managing line-ending issues for this one isn't worth it.

6 years agoAdd a simple test for checkSpace.pl
Nick Mathewson [Tue, 26 Nov 2019 18:10:39 +0000 (13:10 -0500)] 
Add a simple test for checkSpace.pl

This script is not expected to work on windows due to line-ending
issues, so I'm not making it get run on an automated basis.  We
should use it when editing checkSpace.pl.

Closes ticket 32613.

6 years agoMerge branch 'maint-0.4.2'
teor [Tue, 3 Dec 2019 02:47:05 +0000 (12:47 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Tue, 3 Dec 2019 02:46:58 +0000 (12:46 +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 [Tue, 3 Dec 2019 02:46:50 +0000 (12:46 +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 [Tue, 3 Dec 2019 02:46:43 +0000 (12:46 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoTravis: use -std=gnu99 with NSS, and clang with Chutney
teor [Thu, 28 Nov 2019 01:38:48 +0000 (11:38 +1000)] 
Travis: use -std=gnu99 with NSS, and clang with Chutney

NSS:
* test NSS-specific code with -std=gnu99
* use a recent gcc version from the latest Ubuntu image

Chutney:
* use clang, so we keep one clang Linux job
* keep clang on a fast job, so the overall build finishes quickly

Closes ticket 32500 for 0.3.5.

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
teor [Tue, 3 Dec 2019 02:45:41 +0000 (12:45 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

Merge C_DIALECT_OPTIONS from ticket32500_029 with
other configure options from maint-0.3.5.

6 years agoTravis: use -std=gnu99 in some jobs
teor [Fri, 15 Nov 2019 00:17:32 +0000 (10:17 +1000)] 
Travis: use -std=gnu99 in some jobs

Require C99 standards-conforming code in Travis CI, but allow GNU gcc
extensions. Also activates clang's -Wtypedef-redefinition warnings.

Builds some jobs with -std=gnu99, and some jobs without.

Closes ticket 32500.

6 years agoMerge branch 'ticket32207'
Nick Mathewson [Mon, 2 Dec 2019 16:41:40 +0000 (11:41 -0500)] 
Merge branch 'ticket32207'

6 years agoLink to mainloop_pubsub.[ch] when describing delivery policies
Nick Mathewson [Mon, 2 Dec 2019 16:41:16 +0000 (11:41 -0500)] 
Link to mainloop_pubsub.[ch] when describing delivery policies

6 years agoMerge branch 'tor-github/pr/1559'
George Kadianakis [Mon, 2 Dec 2019 10:52:44 +0000 (12:52 +0200)] 
Merge branch 'tor-github/pr/1559'

6 years agoTravis: Set pipefail
teor [Mon, 2 Dec 2019 01:58:54 +0000 (11:58 +1000)] 
Travis: Set pipefail

6 years agoMerge remote-tracking branch 'tor-github/pr/1574'
teor [Sun, 1 Dec 2019 07:53:06 +0000 (17:53 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1574'

6 years agocontrol: Update an outdated function comment
teor [Fri, 29 Nov 2019 00:55:27 +0000 (10:55 +1000)] 
control: Update an outdated function comment

Cleanup after 31531.

6 years agocontrol: Remove an unused function return value
teor [Fri, 29 Nov 2019 00:54:42 +0000 (10:54 +1000)] 
control: Remove an unused function return value

Cleanup after 31531.

6 years agocontrol: Rename a function variable
teor [Fri, 29 Nov 2019 00:53:32 +0000 (10:53 +1000)] 
control: Rename a function variable

Cleanup after 31531.

6 years agocontrol: Remove an unnecessary header in control_events.h
teor [Fri, 29 Nov 2019 00:50:09 +0000 (10:50 +1000)] 
control: Remove an unnecessary header in control_events.h

And replace it with a struct forward declaration.

Also, move all the headers in the file before the forward
declaration.

Cleanup after 31531.

6 years agoMerge branch 'tor-github/pr/1573'
George Kadianakis [Wed, 27 Nov 2019 13:36:26 +0000 (15:36 +0200)] 
Merge branch 'tor-github/pr/1573'

6 years agohs: Add changes file for 32020
David Goulet [Wed, 20 Nov 2019 16:01:47 +0000 (11:01 -0500)] 
hs: Add changes file for 32020

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agotest: Add unit tests for closing intro circ on failure
David Goulet [Thu, 31 Oct 2019 13:04:52 +0000 (09:04 -0400)] 
test: Add unit tests for closing intro circ on failure

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agohs-v3: Remove unused hs_service_intro_circ_has_closed()
David Goulet [Wed, 20 Nov 2019 16:03:45 +0000 (11:03 -0500)] 
hs-v3: Remove unused hs_service_intro_circ_has_closed()

Since the removal of ip->circuit_established, this function does litterally
nothing so clean it up.

Part of #32020

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agohs-v3: Give a cleanup type to hs_circ_cleanup()
David Goulet [Thu, 31 Oct 2019 12:06:16 +0000 (08:06 -0400)] 
hs-v3: Give a cleanup type to hs_circ_cleanup()

By centralizing the circuit cleanup type that is: on close, free and
repurpose, some actions on the circuit can not happen for a certain cleanup
type or for all types.

This passes a cleanup type so the HS subsystem (v2 and v3) can take actions
based on the type of cleanup.

For instance, there is slow code that we do not run on a circuit close but
rather only on free.

Part of #32020

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agohs-v3: Note client intro circuit failure
David Goulet [Wed, 30 Oct 2019 19:56:17 +0000 (15:56 -0400)] 
hs-v3: Note client intro circuit failure

Report back to the v3 subsystem any introduction point client circuit failure
so they can be noted down in the failure cache.

Fixes #32020

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agohs-v2: Modernize rend_client_circuit_cleanup() code
David Goulet [Wed, 30 Oct 2019 19:17:47 +0000 (15:17 -0400)] 
hs-v2: Modernize rend_client_circuit_cleanup() code

Old and messy code path. Structure it in a more pleasant and readable way. No
behavior change with this refactor.

Part of #32020

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMake control_event_conf_changed() take a config_line_t
Neel Chauhan [Wed, 27 Nov 2019 01:57:33 +0000 (20:57 -0500)] 
Make control_event_conf_changed() take a config_line_t

6 years agoIf statements to getresuid() and getresgid() in setuid.c shouldn't have an extra...
Neel Chauhan [Wed, 27 Nov 2019 02:58:31 +0000 (21:58 -0500)] 
If statements to getresuid() and getresgid() in setuid.c shouldn't have an extra space

6 years agocheckSpace.pl: make output more uniform.
Nick Mathewson [Tue, 26 Nov 2019 17:49:13 +0000 (12:49 -0500)] 
checkSpace.pl: make output more uniform.

There were lots of slight differences in indentation and formatting
among the in-file error messages.

6 years agopractracker/includes.py: Don't read editor temp files
teor [Tue, 26 Nov 2019 07:50:56 +0000 (17:50 +1000)] 
practracker/includes.py: Don't read editor temp files

(Or any files that start with "." or "#".)

Obviously correct changes to already-reviewed code.

6 years agoMerge remote-tracking branch 'tor-github/pr/1564'
teor [Tue, 26 Nov 2019 01:30:49 +0000 (11:30 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1564'

6 years agoMakefile: Fix more targets for out-of-tree builds
teor [Sat, 16 Nov 2019 09:57:22 +0000 (19:57 +1000)] 
Makefile: Fix more targets for out-of-tree builds

Support callgraph and rectify-includes in out-of-tree builds.

Part of 32522.

6 years agocrypt_ops: Fix some weird macro spacing
teor [Sat, 16 Nov 2019 13:31:09 +0000 (23:31 +1000)] 
crypt_ops: Fix some weird macro spacing

6 years agoCode Style: Remove double newlines in win32/orconfig.h
teor [Mon, 25 Nov 2019 23:18:37 +0000 (09:18 +1000)] 
Code Style: Remove double newlines in win32/orconfig.h

There's no reason for them to be in there.

Part of 32522.

6 years agocheck-spaces: Fix an outdated comment
teor [Sat, 16 Nov 2019 11:43:22 +0000 (21:43 +1000)] 
check-spaces: Fix an outdated comment

6 years agotest/controller: Stop including a ".c" source file
teor [Sat, 16 Nov 2019 11:47:12 +0000 (21:47 +1000)] 
test/controller: Stop including a ".c" source file

Part of 32522.

6 years agopractracker: Fix a typo in a logging function call
teor [Mon, 25 Nov 2019 23:27:29 +0000 (09:27 +1000)] 
practracker: Fix a typo in a logging function call

Obviously correct changes to already-reviewed code.

6 years agotest: Fix a python double-space
teor [Sat, 16 Nov 2019 14:04:10 +0000 (00:04 +1000)] 
test: Fix a python double-space

6 years agoconfigure: reject Python 2.
Nick Mathewson [Mon, 25 Nov 2019 18:01:04 +0000 (13:01 -0500)] 
configure: reject Python 2.

Python 2 will be end-of-life as of 1 Jan 2020, so we can finally
stop supporting it.  As a first step, we should make our configure
script stop accepting python 2 as something acceptable to run our
tests with.

Closes ticket 32608.

6 years agoMerge branch 'stream-socks-auth' into bug19859_merged
Nick Mathewson [Mon, 25 Nov 2019 12:58:02 +0000 (07:58 -0500)] 
Merge branch 'stream-socks-auth' into bug19859_merged

6 years agoMerge branch 'maint-0.4.2'
teor [Mon, 25 Nov 2019 02:52:10 +0000 (12:52 +1000)] 
Merge branch 'maint-0.4.2'

Merge tor_free() notes with whitespace fixes.

6 years agoCodingStandards: Use consistent spacing
teor [Mon, 25 Nov 2019 02:50:15 +0000 (12:50 +1000)] 
CodingStandards: Use consistent spacing

* 2 newlines before ====== headers
* 1 newline before ------ headers

6 years agoMerge branch 'maint-0.4.2'
teor [Mon, 25 Nov 2019 02:37:26 +0000 (12:37 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Mon, 25 Nov 2019 02:37:15 +0000 (12:37 +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, 25 Nov 2019 02:37:07 +0000 (12:37 +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, 25 Nov 2019 02:36:59 +0000 (12:36 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
teor [Mon, 25 Nov 2019 02:36:41 +0000 (12:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
teor [Mon, 25 Nov 2019 02:35:58 +0000 (12:35 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
teor [Mon, 25 Nov 2019 02:35:11 +0000 (12:35 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
teor [Mon, 25 Nov 2019 02:34:29 +0000 (12:34 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5
teor [Mon, 25 Nov 2019 02:33:55 +0000 (12:33 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5
teor [Mon, 25 Nov 2019 02:33:14 +0000 (12:33 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5
teor [Mon, 25 Nov 2019 02:29:43 +0000 (12:29 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1557'
teor [Mon, 25 Nov 2019 02:24:22 +0000 (12:24 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1557'

6 years agoCodingStandards: Use the correct changes file format
teor [Mon, 25 Nov 2019 01:42:40 +0000 (11:42 +1000)] 
CodingStandards: Use the correct changes file format

And remove a duplicate description of the format.

Obviously correct changes to documentation.

6 years agochanges file for 29826
Nick Mathewson [Sat, 23 Nov 2019 20:35:59 +0000 (15:35 -0500)] 
changes file for 29826

6 years agoprocess_descs.c: rename confusing identifiers
Nick Mathewson [Sat, 23 Nov 2019 20:33:13 +0000 (15:33 -0500)] 
process_descs.c: rename confusing identifiers

The FP_ identifiers referred to fingerprints, but they also applied
to address ranges.  The router_status_t name invited confusion with
routerstasus_t.  Fixes ticket 29826.

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        router_status_t rtr_flags_t \
        FP_INVALID RTR_INVALID \
        FP_BADEXIT RTR_BADEXIT \
        FP_REJECT RTR_REJECT

6 years agorename_c_identifier: don't crash when doing only one replacement.
Nick Mathewson [Sat, 23 Nov 2019 20:30:18 +0000 (15:30 -0500)] 
rename_c_identifier: don't crash when doing only one replacement.

6 years agoFix a low-impact memory leak in options_act_reversible()
Nick Mathewson [Fri, 22 Nov 2019 14:04:36 +0000 (09:04 -0500)] 
Fix a low-impact memory leak in options_act_reversible()

Found by Coverity as CID 1455953

Fixes bug 32575; bug not in any released Tor.

6 years agoht.h: improve documentation for HT_NEXT_RMV.
Nick Mathewson [Thu, 21 Nov 2019 16:56:42 +0000 (11:56 -0500)] 
ht.h: improve documentation for HT_NEXT_RMV.