teor
a00b9e5a86
Merge branch 'ticket32629_040' into ticket32629_041
2019-12-01 20:26:55 +10:00
teor
349554f40d
Merge branch 'ticket32629_035' into ticket32629_040
2019-12-01 20:26:51 +10:00
teor
6558bb4460
Travis: Disable the macOS Rust job
...
This time, we're disabling it because it's the lowest priority job.
(And also slow.)
Part of 32629.
2019-12-01 20:25:00 +10:00
teor
96e620caaf
Merge remote-tracking branch 'tor-github/pr/1574'
2019-12-01 17:53:06 +10:00
teor
41a3930129
control: Update an outdated function comment
...
Cleanup after 31531.
2019-11-29 10:55:27 +10:00
teor
f8f278f8c4
control: Remove an unused function return value
...
Cleanup after 31531.
2019-11-29 10:54:42 +10:00
teor
7a69b3aebc
control: Rename a function variable
...
Cleanup after 31531.
2019-11-29 10:53:32 +10:00
teor
7572988ea9
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.
2019-11-29 10:50:09 +10:00
teor
f2f7491cd9
Merge branch 'ticket32629_029' into ticket32629_035
...
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
2019-11-28 12:21:08 +10:00
teor
453e092e52
Revert "Travis: Disable the Rust macOS build"
...
This reverts commit 4c4a0d50ff
.
2019-11-28 12:11:37 +10:00
teor
99b5f1b261
Revert "Travis: Disable all but one macOS build"
...
This reverts commit 511aeba8ee
.
2019-11-28 12:10:10 +10:00
George Kadianakis
68a00c4951
Merge branch 'tor-github/pr/1573'
2019-11-27 15:36:26 +02:00
David Goulet
85b984dbc6
hs: Add changes file for 32020
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-27 14:52:09 +02:00
David Goulet
c508513014
test: Add unit tests for closing intro circ on failure
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-27 14:52:09 +02:00
David Goulet
a423cec670
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>
2019-11-27 14:52:09 +02:00
David Goulet
cbc495453c
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>
2019-11-27 14:52:09 +02:00
David Goulet
7f83c43594
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>
2019-11-27 14:52:09 +02:00
David Goulet
1aafe3376e
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>
2019-11-27 14:52:09 +02:00
Neel Chauhan
99cf3f99c0
Make control_event_conf_changed() take a config_line_t
2019-11-26 22:12:23 -05:00
Neel Chauhan
96a15bece7
If statements to getresuid() and getresgid() in setuid.c shouldn't have an extra space
2019-11-26 21:58:31 -05:00
Nick Mathewson
2aaa7ae6e2
checkSpace.pl: make output more uniform.
...
There were lots of slight differences in indentation and formatting
among the in-file error messages.
2019-11-26 12:58:25 -05:00
teor
fadd292bf0
practracker/includes.py: Don't read editor temp files
...
(Or any files that start with "." or "#".)
Obviously correct changes to already-reviewed code.
2019-11-26 17:52:18 +10:00
teor
3669a2f827
Merge remote-tracking branch 'tor-github/pr/1564'
2019-11-26 11:30:49 +10:00
teor
c7baacf4c0
Makefile: Fix more targets for out-of-tree builds
...
Support callgraph and rectify-includes in out-of-tree builds.
Part of 32522.
2019-11-26 11:04:02 +10:00
teor
5ec4fb7558
crypt_ops: Fix some weird macro spacing
2019-11-26 11:03:22 +10:00
teor
e66fde45f1
Code Style: Remove double newlines in win32/orconfig.h
...
There's no reason for them to be in there.
Part of 32522.
2019-11-26 11:02:58 +10:00
teor
0ce11433c0
check-spaces: Fix an outdated comment
2019-11-26 11:02:28 +10:00
teor
d7fdab49f7
test/controller: Stop including a ".c" source file
...
Part of 32522.
2019-11-26 11:02:05 +10:00
teor
ab70c315bd
practracker: Fix a typo in a logging function call
...
Obviously correct changes to already-reviewed code.
2019-11-26 11:01:34 +10:00
teor
2a71a58d4f
test: Fix a python double-space
2019-11-26 11:00:39 +10:00
Nick Mathewson
031f204a10
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.
2019-11-25 13:01:04 -05:00
Nick Mathewson
31f8b4fa65
Merge branch 'stream-socks-auth' into bug19859_merged
2019-11-25 07:58:02 -05:00
teor
68b6d85248
Merge branch 'maint-0.4.2'
...
Merge tor_free() notes with whitespace fixes.
2019-11-25 12:52:10 +10:00
teor
eb81704081
CodingStandards: Use consistent spacing
...
* 2 newlines before ====== headers
* 1 newline before ------ headers
2019-11-25 12:50:15 +10:00
teor
03867b3dd7
Merge branch 'maint-0.4.2'
2019-11-25 12:37:26 +10:00
teor
3d6545250e
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-25 12:37:15 +10:00
teor
26071aa3be
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-25 12:37:07 +10:00
teor
055f5d4d1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-25 12:36:59 +10:00
teor
c17ab20ac0
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
2019-11-25 12:36:41 +10:00
teor
ed6f2f61a2
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
2019-11-25 12:35:58 +10:00
teor
501b5174d8
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
2019-11-25 12:35:11 +10:00
teor
400cee261e
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
2019-11-25 12:34:29 +10:00
teor
54c01119ed
Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5
2019-11-25 12:33:55 +10:00
teor
83424cb62f
Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5
2019-11-25 12:33:14 +10:00
teor
f9812ee5f7
Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5
2019-11-25 12:29:43 +10:00
teor
e6ceded7d8
Merge remote-tracking branch 'tor-github/pr/1557'
2019-11-25 12:24:22 +10:00
teor
969ee5d77f
CodingStandards: Use the correct changes file format
...
And remove a duplicate description of the format.
Obviously correct changes to documentation.
2019-11-25 11:44:22 +10:00
Nick Mathewson
75f417fd0c
changes file for 29826
2019-11-23 15:35:59 -05:00
Nick Mathewson
1d117e826f
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
2019-11-23 15:33:13 -05:00
Nick Mathewson
d9d75d4ae1
rename_c_identifier: don't crash when doing only one replacement.
2019-11-23 15:30:18 -05:00