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
38,856 Commits 53 Branches 631 Tags
cfc7087848390f18bcff618cc6ebdcf45aa34aa3
Commit Graph

38856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Goulet cfc7087848 Merge branch 'maint-0.4.8' into release-0.4.8 2023-11-03 09:04:27 -04:00
David Goulet 24dc829b9a Merge branch 'maint-0.4.7' into maint-0.4.8 2023-11-03 09:04:27 -04:00
Alexander Færøy 7aa496a2e0 Fix TROVE-2023-004: Remote crash when compiled against OpenSSL 
Fixes #40874

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-11-03 08:52:38 -04:00
David Goulet 389b7d4903 Merge branch 'maint-0.4.8' into release-0.4.8 2023-10-30 13:46:19 -04:00
Mike Perry 09685fa038 Changes file for bug 40878 2023-10-30 16:55:11 +00:00
Mike Perry d9e7759088 Bug 40878: Count a valid conflux linked cell as valid data 
For vanguards addon.
 2023-10-30 16:54:49 +00:00
David Goulet c59c30fedb Merge branch 'maint-0.4.8' into release-0.4.8 2023-10-12 12:41:04 -04:00
David Goulet 660f4b8f4a configure: Bump version to 0.4.8.8-dev 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-10-12 12:40:49 -04:00
David Goulet 766f7edd72 Merge branch 'maint-0.4.8' into release-0.4.8 2023-10-11 14:51:59 -04:00
David Goulet aa5e8510a3 Merge branch 'bug40869_048' into 'maint-0.4.8' 
Fix the spelling of maxunmeasur(e)dbw (backport to 0.4.8)

See merge request tpo/core/tor!774
 2023-10-11 18:51:44 +00:00
Nick Mathewson 8c22fd4a4d Fix the spelling of maxunmeasur(e)dbw. 
This has been misspelled when using consensus method 31 or later
since 0.4.6.1-alpha.  Fixes bug 40869.

This commit is a backport of b9b0abd6c2 to 0.4.8.
 2023-10-11 10:08:53 -04:00
David Goulet 75f45140d6 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-25 10:44:29 -04:00
David Goulet c11ba9dea8 version: Bump version to 0.4.8.7-dev 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-25 10:44:06 -04:00
David Goulet bf5e234d44 Merge branch 'maint-0.4.8' into release-0.4.8 tor-0.4.8.7 2023-09-25 09:58:39 -04:00
Tor CI Release edf395ecf6 version: Bump version to 0.4.8.7 2023-09-25 09:58:15 -04:00
David Goulet 360e22e7ce release: ChangeLog and ReleaseNotes for 0.4.8.7 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-25 09:57:44 -04:00
David Goulet bdfd134eec Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-25 09:51:49 -04:00
Tor CI Release f55e344601 fallbackdir: Update list generated on September 25, 2023 2023-09-25 09:51:25 -04:00
Tor CI Release 7675bd9be9 Update geoip files to match ipfire location db, 2023/09/25. 2023-09-25 09:51:25 -04:00
David Goulet 498e7e24d0 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-21 08:59:02 -04:00
Mike Perry 4dda47839c Changes file for bug40862 2023-09-21 00:08:01 +00:00
Mike Perry d499de5813 Bug 40862: Check if circuits are unused more ways 2023-09-20 23:35:36 +00:00
David Goulet c857d0e467 Remove runaway string in the ReleaseNotes file 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-18 11:09:29 -04:00
David Goulet f97cbb69b1 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 10:58:04 -04:00
Tor CI Release 03a31dbb68 version: Bump version to 0.4.8.6-dev 2023-09-18 10:57:55 -04:00
David Goulet e71aa6153b Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 10:57:45 -04:00
Tor CI Release d7777c121c version: Bump version to 0.4.7.15-dev 2023-09-18 10:57:35 -04:00
David Goulet 1cd77f58e0 Merge branch 'maint-0.4.8' into release-0.4.8 tor-0.4.8.6 2023-09-18 10:05:56 -04:00
Tor CI Release 99c55f52e7 version: Bump version to 0.4.8.6 2023-09-18 10:05:42 -04:00
David Goulet aebfbcc530 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 10:05:33 -04:00
Tor CI Release 69fdf36dd1 version: Bump version to 0.4.7.15 2023-09-18 10:05:23 -04:00
David Goulet 6f681f5d05 release: ChangeLog and ReleaseNotes for 0.4.8.6 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-18 10:03:45 -04:00
David Goulet 653ecb82d2 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:52:00 -04:00
David Goulet 62c0f9ec79 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:51:59 -04:00
Tor CI Release 4a11b4b95c fallbackdir: Update list generated on September 18, 2023 2023-09-18 09:51:12 -04:00
Tor CI Release 4fc5fe7f69 Update geoip files to match ipfire location db, 2023/09/18. 2023-09-18 09:51:07 -04:00
David Goulet e5e00772ee Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:40:42 -04:00
David Goulet 0296090420 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:40:38 -04:00
David Goulet b064de3c68 Match fallbackdir with maint-0.4.8 for release 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-18 09:40:27 -04:00
David Goulet a75cc617b3 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:27:38 -04:00
David Goulet 267c5e0235 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:27:34 -04:00
David Goulet 5e961007db geoip: Match maint-0.4.8 files for release 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-18 09:27:20 -04:00
David Goulet 2adbd06a7f Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:11:06 -04:00
David Goulet 2c8430cb2f Merge branch 'tor-gitlab/mr/759' into maint-0.4.8 2023-09-18 09:11:02 -04:00
David Goulet cb036351c0 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:10:44 -04:00
David Goulet cd2bc94c44 Merge branch 'tor-gitlab/mr/761' into maint-0.4.8 2023-09-18 09:10:39 -04:00
David Goulet 8ef30841ac Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:08:57 -04:00
David Goulet c24203cf31 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:08:57 -04:00
David Goulet 6a73836e08 Merge branch 'tor-gitlab/mr/766' into maint-0.4.7 2023-09-18 09:08:52 -04:00
David Goulet e9a4350bb7 Merge branch 'maint-0.4.8' into release-0.4.8 2023-09-18 09:08:17 -04:00