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,226 Commits 53 Branches 631 Tags
4ccf99b549ed89ed45b7ca1b8bb8a3fac5fc2a87
Commit Graph

35226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 4ccf99b549 Merge branch 'maint-0.4.3' into release-0.4.3 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 e0caad5d4f Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-11 10:44:40 -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 8a0f530adf Add a pair of warnings about only editing CI in 035 2020-08-11 10:44:32 -04:00
Nick Mathewson ffe240951e Merge branch 'maint-0.4.3' into release-0.4.3 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 44546aeb3f Merge branch 'maint-0.4.3' into release-0.4.3 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
Alexander Færøy f67d5b39a4 Merge branch 'maint-0.4.3' into release-0.4.3 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 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 97b8a25162 Merge branch 'maint-0.4.3' into release-0.4.3 2020-07-29 12:37:07 -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 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 8b5b0c2bda Merge branch 'maint-0.4.3' into release-0.4.3 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
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 f7dbae4e89 Merge branch 'maint-0.4.3' into release-0.4.3 2020-07-23 10:09:14 -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 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
David Goulet 05af1e25a0 Merge branch 'maint-0.4.3' into release-0.4.3 2020-07-13 14:58:40 -04:00
Nick Mathewson 0acc3ae879 Remove check-cocci from check-local target. 
check-cocci is still a good idea -- perhaps as a cron job?  But
doing it as part of our regular tests has just been confusing,
especially to volunteers who shouldn't have to become coccinelle
experts in order to get their patches through our CI.

Closes #40030.
 2020-07-13 09:24:26 -04:00
Nick Mathewson af46b1d8cd Merge branch 'maint-0.4.3' into release-0.4.3 2020-07-09 13:15:59 -04:00
Nick Mathewson 3517d20322 Bump to 0.4.3.6-dev 2020-07-09 13:15:15 -04:00
Nick Mathewson 42c0358ceb Merge branch 'maint-0.4.2' into maint-0.4.3 
`-s ours` to avoid version bump.
 2020-07-09 13:14:58 -04:00
Nick Mathewson 49b4d1765c Bump to 0.4.2.8-dev 2020-07-09 13:14:48 -04:00
Nick Mathewson 6e01d5e685 Merge branch 'maint-0.3.5' into maint-0.4.2 
`-s ours` to avoid version bump.
 2020-07-09 13:14:22 -04:00
Nick Mathewson c9751e2611 Bump to 0.3.5.11-dev 2020-07-09 13:12:45 -04:00
Nick Mathewson 30711296fd Merge branch 'maint-0.4.3' into release-0.4.3 tor-0.4.3.6 2020-07-09 10:32:39 -04:00
Nick Mathewson 7ba849349a Update version to 0.4.3.6. 2020-07-09 10:31:09 -04:00
Nick Mathewson 70161785f9 Merge branch 'maint-0.4.2' into maint-0.4.3 
`-s ours` to avoid version bump.
 2020-07-09 10:30:46 -04:00
Nick Mathewson 5aaecf6d07 Update version to 0.4.2.8. 2020-07-09 10:30:37 -04:00
Nick Mathewson 78285594f5 Merge branch 'maint-0.3.5' into maint-0.4.2 
`-s ours` to avoid version bump.
 2020-07-09 10:30:03 -04:00
Nick Mathewson 0bb227d170 bump to 0.3.5.11 2020-07-09 10:28:21 -04:00