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
30,920 Commits 53 Branches 631 Tags
25f39bdfc4dfdba02b6f5e5f54938413fc53336d
Commit Graph

30920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
teor 25f39bdfc4 Merge branch 'doc31089_029' into doc31089_035 2019-08-08 23:07:12 +10:00
rl1987 1087c48d6e Hardcode the image into tor-exit-notice.html 2019-08-08 22:46:51 +10:00
teor e83eabc9bf Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
 2019-08-08 11:17:46 +10:00
teor 1bc2ae7be7 Merge branch 'maint-0.2.9' into maint-0.3.5 
Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.
 2019-08-08 11:10:15 +10:00
teor e15b9b1790 Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5 2019-08-08 11:07:11 +10:00
teor 8d22c09abf Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9 2019-08-08 10:55:24 +10:00
teor 518b69b57c Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9 2019-08-08 10:54:12 +10:00
Nick Mathewson 1dd9527897 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-07-01 14:25:12 -04:00
teor 6bc8dedbed Travis: SKIP_MAKE_CHECK="yes" when running stem 
And add some comments about stem

Part of 29280.
 2019-07-01 14:33:54 +10:00
teor 84f2c0affb Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035 2019-07-01 14:33:37 +10:00
teor 75f9ae9029 Travis: remove a redundant os: linux line 
Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .

Part of 29280.
 2019-07-01 14:25:37 +10:00
teor ac7ce17983 Travis: show the chutney commit and python version 
Part of 29280.
 2019-07-01 14:25:33 +10:00
teor b26e3e4c56 Travis: show chutney logs on chutney job failure 
Part of 29280.
 2019-07-01 14:05:26 +10:00
teor 5fda190309 Travis: Log stem's TRACE logs to a file, and tail it on failure 
Also filter out stem's SocketClosed logs, and fix some nearby comments.

Part of 30591.
 2019-07-01 13:01:52 +10:00
teor fb977f8cac changes: file for 28795 
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.

Closes ticket 28795.

Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
 2019-06-28 21:38:33 +10:00
teor f3b2a81ce7 fallback: apply the second fallback list from 2019 
Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc

Part of 28795, see that ticket for logs.
 2019-06-28 21:16:50 +10:00
teor 37c2808ab0 fallback: apply the first fallback list from 2019 
Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc

Part of 28795, see that ticket for logs.
 2019-06-28 21:05:00 +10:00
teor 1cad1f9804 Travis: Don't log stem's SocketClosed TRACE logs to the console 
And fix some nearby comments.

Part of 30591.
 2019-06-14 12:13:28 +10:00
Nick Mathewson 63325c0596 Add a chutney mode to travis.yml. 2019-06-12 08:55:38 -04:00
Nick Mathewson b0826346a6 Travis: control "make check" with its own flag 
Previously we had "make check" launched whenever DISTCHECK was
false.  Now we'd like to turn it off in a few other circumstances,
like running chutney.  Maybe stem too?
 2019-06-12 08:51:46 -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
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
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
teor cdda69ca8a Travis: only run the stem tests that use a tor binary 
Closes ticket 30694.
 2019-05-30 20:05:03 +10:00
teor 9eb221b2d2 Travis: make stem log a controller trace, and tail stem's tor log 
In Travis, make stem log a controller trace to the console.
And tail stem's tor log after failure.

Closes ticket 30591.
 2019-05-28 10:20:36 +10:00
Nick Mathewson e5deb2bbc7 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-05-17 08:10:16 -04:00
Nick Mathewson a521c42788 Merge branch 'maint-0.2.9' into maint-0.3.4 2019-05-17 08:10:15 -04:00
Karsten Loesing 4e262196a8 Update geoip and geoip6 to the May 13 2019 database. 2019-05-17 08:52:13 +02:00
Nick Mathewson 6945f2b3ef Merge branch 'bug30475_035' into maint-0.3.5 2019-05-15 07:41:34 -04:00
Nick Mathewson ff55840343 Don't pass a NULL into a %s when logging client auth file load failure 
Fortunately, in 0.3.5.1-alpha we improved logging for various
failure cases involved with onion service client auth.

Unfortunately, for this one, we freed the file right before logging
its name.

Fortunately, tor_free() sets its pointer to NULL, so we didn't have
a use-after-free bug.

Unfortunately, passing NULL to %s is not defined.

Fortunately, GCC 9.1.1 caught the issue!

Unfortunately, nobody has actually tried building Tor with GCC 9.1.1
before. Or if they had, they didn't report the warning.

Fixes bug 30475; bugfix on 0.3.5.1-alpha.
 2019-05-10 17:47:43 -04:00
rl1987 6b2d8b1a7c Add changes file 2019-04-30 09:15:35 +03:00
rl1987 5c00b25c0e Travis: remove sudo configuration 
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
 2019-04-30 09:15:31 +03:00
rl1987 1218546296 Add changes file 2019-04-30 09:11:17 +03:00
rl1987 8f4840b31a Travis: remove sudo configuration 
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
 2019-04-30 09:11:06 +03:00
teor 9a97b5ff56 Travis: Show stem's tor log after failure 
Closes ticket 30234.
 2019-04-22 11:48:07 +10:00
teor 231036a110 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-04-19 12:00:41 +10:00
teor cbce8dedd3 Merge branch 'maint-0.2.9' into maint-0.3.4 
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)
 2019-04-19 11:59:18 +10:00
teor 742b5b32d5 Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5 2019-04-19 11:52:48 +10:00
teor cb084de5e5 Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5 2019-04-19 11:51:05 +10:00
teor 2ae67fee42 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5 2019-04-19 11:48:41 +10:00
teor 4a66c2d636 Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5 2019-04-19 11:47:50 +10:00
teor 116970dda7 Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4 2019-04-19 11:47:10 +10:00
teor b1762f8d12 Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4 2019-04-19 11:44:38 +10:00
teor 8154b33f9c Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4 2019-04-19 11:43:46 +10:00