torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,589 Commits 53 Branches 631 Tags
7541aaf988182d37addb07645f144dae7f3a0443
Commit Graph
24094 Commits
Author SHA1 Message Date
Nick Mathewson 3ccf91027b Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1 2019-06-26 10:05:51 -04:00
Nick Mathewson 648d5df628 Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1 2019-06-26 09:49:40 -04:00
George Kadianakis 00acccac64 Merge branch 'tor-github/pr/1114' into maint-0.4.1 2019-06-26 10:51:12 +03:00
Nick Mathewson e4f66bf7ff bump to 0.4.1.3-alpha-dev 2019-06-25 11:55:53 -04:00
Nick Mathewson 8803930de8 Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1 2019-06-24 13:36:10 -04:00
Nick Mathewson aab5f42ae0 bump to 0.4.1.3-alpha 2019-06-24 09:32:46 -04:00
teor 8356cc5b51 stats: Always publish pluggable transports in extra info documents 
Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.

Fixes bug 30956; bugfix on 0.4.1.1-alpha.
 2019-06-24 19:44:24 +10:00
David Goulet 6a0763cd66 guard: Ignore marked for close circuit when changing state to open 
When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.

This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.

For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.

This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.

Fixes #30871

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-06-19 07:41:45 -04:00
Nick Mathewson 4ab1d1c0c4 Fix memleak when failing to parse a CSV_INTERVAL. 
Fixes bug 30894; bugfix on 0.3.4.1-alpha
 2019-06-15 16:47:16 -04:00
David Goulet ea14fb136c Merge branch 'tor-github/pr/1050' into maint-0.4.1 2019-06-11 11:29:46 -04:00
Nick Mathewson cad0de35bd Give a compile warning when we don't have any flags for minherit(). 
Part of ticket 30686.
 2019-06-11 11:29:23 -04:00
Nick Mathewson 93ddc51cbd Give a more useful failure messgae when we fail to minherit(). 
Part of ticket 30686.
 2019-06-11 11:29:23 -04:00
Nick Mathewson ce89fe36c8 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-11 10:17:18 -04:00
Nick Mathewson afa2c39baa Merge branch 'maint-0.3.5' into maint-0.4.0 2019-06-11 10:17:18 -04:00
Nick Mathewson b0fa1f4fb0 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-06-11 10:17:17 -04:00
Karsten Loesing 0ec4ebd00d Update geoip and geoip6 to the June 10 2019 database. 2019-06-11 16:12:50 +02:00
Nick Mathewson 29842f68e7 Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 2019-06-11 08:41:48 -04:00
George Kadianakis a15ec8bf84 circpad: some more logging changes. 
- Add an info log when receiving a STOP command.
- Keep warning if we receive padding from a wrong hop.
 2019-06-11 14:28:38 +03:00
George Kadianakis eab9dc06af Merge branch 'tor-github/pr/1065' into maint-0.4.1 2019-06-11 13:48:10 +03:00
teor a742a80eea Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 2019-06-11 14:51:37 +10:00
teor cb20054ccd Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 2019-06-11 14:46:24 +10:00
Nick Mathewson 6a72cc2598 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-10 18:33:26 -04:00
teor b9041e8a63 test: fix a typo in test_rebind.sh 
Closes 30821.
 2019-06-10 20:56:40 +10:00
teor 430dd2da6e Merge branch 'bug30713_035' into bug30713_040 2019-06-10 20:50:53 +10:00
teor be0a4be276 Travis: Skip test_rebind on macOS builds 
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.

Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.

Fixes bug 30713; bugfix on 0.3.5.1-alpha.
 2019-06-10 20:49:59 +10:00
Nick Mathewson ecc5feff38 bump to 0.4.1.2-alpha-dev 2019-06-06 08:28:34 -04:00
teor c7fc53c2e7 Merge branch 'bug30781_040' into bug30781_master 2019-06-06 09:57:31 +10:00
teor fb3f461406 Merge branch 'bug30781_035' into bug30781_040 2019-06-06 09:56:50 +10:00
teor c8c2e2b8fc Merge branch 'bug30781_034' into bug30781_035 
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
 2019-06-06 09:55:44 +10:00
teor dc8e3cd5ce Merge branch 'bug30781_029' into bug30781_034 2019-06-06 09:53:02 +10:00
teor ba83c1e5cf dirparse: Stop crashing when parsing unknown descriptor purpose annotations 
We think this bug can only be triggered by modifying a local file.

Fixes bug 30781; bugfix on 0.2.0.8-alpha.
 2019-06-06 09:51:24 +10:00
Nick Mathewson 6a6f7eb671 Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0 2019-06-05 16:22:52 -04:00
Nick Mathewson e51b57ee04 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0 2019-06-05 16:16:34 -04:00
Nick Mathewson 04cb2d4010 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0 2019-06-05 16:14:51 -04:00
Nick Mathewson 2300a619a5 Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0 2019-06-05 16:13:53 -04:00
Nick Mathewson a56d7e37aa Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0 2019-06-05 16:10:51 -04:00
Nick Mathewson 54eb3c043c Merge remote-tracking branch 'tor-github/pr/1076' 2019-06-05 15:35:43 -04:00
Mike Perry e54ce03b4f More LOG_PROTOCOL_WARN. 
Make origin-side messages about padding negotiation failure into
LOG_PROTOCOL_WARN.

I'm not sure I like this either.. But the negotiation refusal case might
happen naturally due to consensus drift, and is functionally no different than
a corrupted cell.
 2019-06-05 12:33:39 -07:00
Mike Perry c525135dac Bug 29034: Cleanup hs circuitmap when purpose changes. 
Leave the other rend and hs_ident data around until circuit free, since code
may still try to inspect it after marking the circuit for close. The
circuitmap is the important thing to clean up, since repurposed
intropoints must be removed from this map to ensure validity.
 2019-06-05 11:50:44 -07:00
Mike Perry 31c34f6524 Revert "hs: Implement a helper to repurpose a circuit" 
This reverts commit 3789f22bcb.
 2019-06-05 11:38:01 -07:00
Mike Perry a42131bf48 Revert "test: Add test_hs_circ.c for HS circuit testing" 
This reverts commit 41b94722e5.
 2019-06-05 11:37:32 -07:00
Neel Chauhan 27e067df4f Add missing newline after decode_intro_points() closing bracket 2019-06-05 12:50:01 -04:00
George Kadianakis 917e4e9eae Don't access rend data after a circuit has been marked for close. 
This can cause issues if the circuit was repurposed into a padding circuit
instead of closing, since in that case we will wipe off the rend_data.
 2019-06-05 18:19:44 +03:00
Nick Mathewson 892a313b6a Replace a missing end-of-comment string 
This happened when I went to fix long lines after running "make
autostyle".
 2019-06-05 09:35:45 -04:00
Nick Mathewson 60213a3621 Run "make autostyle." 2019-06-05 09:33:35 -04:00
Nick Mathewson d1b02456c1 Bump to 0.4.1.2-alpha 2019-06-05 09:25:21 -04:00
Nick Mathewson b39a8d315d Merge remote-tracking branch 'tor-github/pr/1053' 2019-06-05 09:04:09 -04:00
George Kadianakis 99bf3d8e14 Merge branch 'tor-github/pr/1072' 2019-06-05 14:40:38 +03:00
David Goulet a63c5f844b Merge branch 'tor-github/pr/1067' 2019-06-04 09:57:03 -04:00
Nick Mathewson 4022b6d6b7 Merge branch 'bug29670_035' into bug29670_041 2019-06-04 08:29:05 -04:00