aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-08Merge branch 'doc31089_029' into doc31089_035teor
2019-08-08Hardcode the image into tor-exit-notice.htmlrl1987
2019-08-08Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5teor
Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591.
2019-08-08Merge branch 'maint-0.2.9' into maint-0.3.5teor
Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.
2019-08-08Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9teor
2019-07-01Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-07-01Travis: SKIP_MAKE_CHECK="yes" when running stemteor
And add some comments about stem Part of 29280.
2019-07-01Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035teor
2019-07-01Travis: remove a redundant os: linux lineteor
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-01Travis: show the chutney commit and python versionteor
Part of 29280.
2019-07-01Travis: show chutney logs on chutney job failureteor
Part of 29280.
2019-07-01Travis: Log stem's TRACE logs to a file, and tail it on failureteor
Also filter out stem's SocketClosed logs, and fix some nearby comments. Part of 30591.
2019-06-28changes: file for 28795teor
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-28fallback: apply the second fallback list from 2019teor
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-28fallback: apply the first fallback list from 2019teor
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-14Travis: Don't log stem's SocketClosed TRACE logs to the consoleteor
And fix some nearby comments. Part of 30591.
2019-06-12Add a chutney mode to travis.yml.Nick Mathewson
2019-06-12Travis: control "make check" with its own flagNick Mathewson
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-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-06-11Update geoip and geoip6 to the June 10 2019 database.Karsten Loesing
2019-06-11Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5teor
2019-06-10Travis: Skip test_rebind on macOS buildsteor
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-10Travis: allow the test-stem job to failteor
Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-05-30Travis: only run the stem tests that use a tor binaryteor
Closes ticket 30694.
2019-05-28Travis: make stem log a controller trace, and tail stem's tor logteor
In Travis, make stem log a controller trace to the console. And tail stem's tor log after failure. Closes ticket 30591.
2019-05-17Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-05-17Merge branch 'maint-0.2.9' into maint-0.3.4maint-0.3.4Nick Mathewson
2019-05-17Update geoip and geoip6 to the May 13 2019 database.Karsten Loesing
2019-05-15Merge branch 'bug30475_035' into maint-0.3.5Nick Mathewson
2019-05-10Don't pass a NULL into a %s when logging client auth file load failureNick Mathewson
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-04-30Add changes filerl1987
2019-04-30Travis: remove sudo configurationrl1987
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2019-04-30Add changes filerl1987
2019-04-30Travis: remove sudo configurationrl1987
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2019-04-22Travis: Show stem's tor log after failureteor
Closes ticket 30234.
2019-04-19Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-19Merge branch 'maint-0.2.9' into maint-0.3.4teor
"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-19Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4teor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion