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
35,715 Commits 53 Branches 631 Tags
673d02bdb0517cc9867d0f67aec887f71e6d1ce5
Commit Graph
35715 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 673d02bdb0 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 11:03:24 -04:00
Nick Mathewson 6bee9bd481 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 11:03:24 -04:00
Nick Mathewson da8577bb75 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 11:03:24 -04:00
Nick Mathewson aa2c93b90b Fix a pair of typos in ci-driver.sh. 2020-08-11 11:03:11 -04:00
Nick Mathewson 2a7e71c956 Fix "run_check_subsystem_order.sh" to use $PYTHON. 
Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.

Fixes bug 40095; bugfix on 0.4.4.1-alpha.
 2020-08-11 11:01:31 -04:00
Nick Mathewson 262ddfee7a Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 10:44:40 -04:00
Nick Mathewson e4a6d9d5a9 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 10:44:40 -04:00
Nick Mathewson d83703317d Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-11 10:44:40 -04:00
Nick Mathewson 8a0f530adf Add a pair of warnings about only editing CI in 035 2020-08-11 10:44:32 -04:00
George Kadianakis ab9c35f043 Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4 2020-08-11 14:53:03 +03:00
Nick Mathewson 7d80bf80fe Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-10 19:33:07 -04:00
Nick Mathewson f3fcc89d05 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-10 19:33:06 -04:00
Nick Mathewson 68f8250cbb Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-10 19:32:49 -04:00
Nick Mathewson e873c7e893 small code tweaks to try to work around debian stable complaints 2020-08-10 19:20:05 -04:00
Nick Mathewson 057f40f3d8 Try to set up a minimal gitlab CI script 
This is based on @eighthave's templates, and the work we've been
doing to present a uniform testing environment.
 2020-08-10 19:20:05 -04:00
Nick Mathewson cb027b392f Add a shareable continuous-integration script. 
Eventually this should be used by every one of our CI scripts.
 2020-08-10 19:01:05 -04:00
Nick Mathewson c1b440f760 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-08-06 13:24:12 -04:00
Nick Mathewson 39d5e7c764 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-06 13:24:11 -04:00
Nick Mathewson 352991c843 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-06 13:24:11 -04:00
Nick Mathewson bac8967e24 Copy from master gitlab-ci.yml from master back to maint-0.3.5 2020-08-06 12:42:14 -04:00
Nick Mathewson ea876ab00e Wipe address strings from connections before freeing them them. 
This is a defense-in-depth fix; closes 6198.
 2020-08-03 10:15:08 -04:00
Nick Mathewson 5b9508c9a5 Add a tor_str_wipe_and_free() function. 
Frequently we want to do

    if (s) {
      memwipe(s, 0, sizeof(s));
      tor_free(s);
    }

and it's good to have a way to do this concisely.
 2020-08-03 10:11:03 -04:00
George Kadianakis 18d2c7c5d7 Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4 2020-08-03 16:48:52 +03:00
Alexander Færøy 4c22050de1 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-31 02:03:35 +00:00
Alexander Færøy e78a7450a2 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-31 02:03:34 +00:00
Alexander Færøy 4e684c8695 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-31 02:03:34 +00:00
Nick Mathewson b4400e2093 Merge branch 'bug40076_043' into bug40076_044 2020-07-30 14:28:11 -04:00
Nick Mathewson 69d7752937 Merge branch 'bug40076_042' into bug40076_043 2020-07-30 14:27:29 -04:00
Nick Mathewson c2d5ec5e43 Merge branch 'maint-0.4.2' into bug40076_042 2020-07-30 14:27:29 -04:00
Nick Mathewson c4742b89b2 Fix a bug in buf_move_all() when the input buffer is empty. 
We found this in #40076, after we started using buf_move_all() in
more places.  Fixes bug #40076; bugfix on 0.3.3.1-alpha.  As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".
 2020-07-30 14:24:25 -04:00
Nick Mathewson 0a588821cb Add unit test for buf_move_all(), including a failing case 
The failing case is #if'd out for now, but will be fixed in the next
commit.

Testing for a fix for #40076.
 2020-07-30 14:19:32 -04:00
Nick Mathewson 0c8c295963 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-29 12:37:08 -04:00
Nick Mathewson 3b8bf743ae Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-29 12:37:07 -04:00
Nick Mathewson cdb0e6c252 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-29 12:37:07 -04:00
Nick Mathewson c7502b6503 Add a changes file from mr 86 for 40072 fix. 2020-07-29 12:36:56 -04:00
Nick Mathewson 8c92d44622 Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4 2020-07-29 12:35:57 -04:00
Alexander Færøy 8e690ce736 Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4 2020-07-29 13:57:47 +00:00
Daniel Pinto eab8e7af52 Fix startup crash with seccomp sandbox enabled #40072 
Fix crash introduced in #40020. On startup, tor calls
check_private_dir on the data and key directories. This function
uses open instead of opendir on the received directory. Data and
key directoryes are only opened here, so the seccomp rule added
should be for open instead of opendir, despite the fact that they
are directories.
 2020-07-29 00:34:08 +01:00
Nick Mathewson dcc60294ad Use _lseeki64() on windows. 
Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging
system to use posix fds.
 2020-07-28 11:30:47 -04:00
Nick Mathewson 0a38e02fb3 bump to 0.4.4.3-alpha-dev 2020-07-27 19:15:15 -04:00
Nick Mathewson 31eba7f009 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-27 12:56:19 -04:00
Nick Mathewson 97d0cb83ed Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-27 12:56:18 -04:00
Nick Mathewson c0bc30b6f0 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-27 12:56:18 -04:00
Nick Mathewson 95914ceb57 Bump to 0.4.4.3-alpha 2020-07-27 08:32:56 -04:00
David Goulet 564a9a54a1 fallbackdir: Remove all three Digitalcourage3 relays 
They are about to be shutdown in September.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-24 14:56:07 -04:00
Nick Mathewson 6354b70e49 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-23 10:09:14 -04:00
Nick Mathewson 3bcbd69a77 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-23 10:09:14 -04:00
Nick Mathewson 07934664c5 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-23 10:09:14 -04:00
Nick Mathewson f916ddd312 More info in the fallbackdir changes file 2020-07-23 10:08:42 -04:00
David Goulet 6f19e67c98 fallbackdir: Update list for 2020 
Closes #40061

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-07-23 10:05:11 -04:00