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,566 Commits 53 Branches 631 Tags
e5ad6fb09298eff0bf8ebf0c3729602b91c3d9df
Commit Graph
32566 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
George Kadianakis e5ad6fb092 Merge branch 'ticket30769_041_01' 2019-06-11 14:11:24 +03:00
David Goulet c1359b32a4 trunnel: Rename sendme.trunnel to sendme_cell.trunnel 
This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.

Fixes #30769

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-06-11 14:11:10 +03:00
George Kadianakis 646f7a9a94 Merge branch 'ticket30687_042_01' 2019-06-11 14:02:33 +03:00
David Goulet 7cf9d54e6d token-bucket: Implement a single counter object 
Closes #30687.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-06-11 14:02:22 +03:00
George Kadianakis b83dba7cb0 Merge branch 'maint-0.4.1' 2019-06-11 13:48:16 +03:00
George Kadianakis eab9dc06af Merge branch 'tor-github/pr/1065' into maint-0.4.1 2019-06-11 13:48:10 +03:00
George Kadianakis ece5133e0d Merge branch 'tor-github/pr/1098' 2019-06-11 13:19:43 +03:00
teor e9f1e975df Merge branch 'maint-0.4.1' 2019-06-11 14:52:40 +10:00
teor 2779ce1f6f Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-11 14:52:36 +10:00
teor 4ca18fde93 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-06-11 14:52:27 +10:00
teor dcb8cad4e6 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 2019-06-11 14:51:46 +10: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 202ccc3930 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 2019-06-11 14:48:52 +10:00
teor a58c4cc6dd Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 2019-06-11 14:47:40 +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 cfa943f140 Merge branch 'maint-0.4.1' 2019-06-10 18:44:31 -04:00
Nick Mathewson 5b07ff4011 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-10 18:44:31 -04:00
Nick Mathewson c8447f95ec Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 2019-06-10 18:44:20 -04:00
Nick Mathewson d6b411a351 Merge branch 'maint-0.4.1' 2019-06-10 18:33:26 -04:00
Nick Mathewson 6a72cc2598 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-10 18:33:26 -04:00
Nick Mathewson c8e09dd0d2 Merge branch 'maint-0.4.1' 2019-06-10 18:31:36 -04:00
Nick Mathewson c0285320df Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1 2019-06-10 18:31:23 -04:00
Nick Mathewson df8e2bbc0f Merge remote-tracking branch 'tor-github/pr/1038' 2019-06-10 09:38:40 -04:00
Nick Mathewson 1190636f24 Merge branch 'maint-0.4.1' 2019-06-10 09:37:28 -04:00
Nick Mathewson 765e4364d9 Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1 2019-06-10 09:37:17 -04:00
Nick Mathewson 0635170cf1 Add an environment variable to set GIT_PATH in git scripts 2019-06-10 09:05:26 -04:00
Nick Mathewson bbddda3a18 push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH 
We already allow this override in our pre-push hook, so let's allow
it here too.

(I call my upstream branches "origin")
 2019-06-10 09:01:17 -04:00
Nick Mathewson 46da530431 Update git scripts for new versions 
{maint,release}-0.4.1 are now real

{maint,release}-0.3.4 are now EOL

Closes ticket 30822
 2019-06-10 09:01:17 -04:00
Nick Mathewson adc7b50eae Bump master to 0.4.2.0-alpha-dev 2019-06-10 08:47:33 -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
teor d761c3ca6d Travis: allow the test-stem job to fail 
Allow the test-stem job to fail in Travis, because it sometimes hangs.

Fixes bug 30744; bugfix on 0.3.5.4-alpha.
 2019-06-10 19:18:35 +10:00
Nick Mathewson ecc5feff38 bump to 0.4.1.2-alpha-dev 2019-06-06 08:28:34 -04:00
Nick Mathewson 3c2b2f072f Merge branch 'maint-0.4.0' tor-0.4.1.2-alpha 2019-06-05 16:24:10 -04: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 d63c17f2af Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0 2019-06-05 16:22:29 -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 851e881f01 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0 2019-06-05 16:12:07 -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 30f0e993c9 push release date to tomorrow: too many last minute surprises 2019-06-05 15:53:52 -04:00
Nick Mathewson 4ceec4760c change some CI-substitute logic 2019-06-05 15:38:25 -04:00
Nick Mathewson 54eb3c043c Merge remote-tracking branch 'tor-github/pr/1076' 2019-06-05 15:35:43 -04: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