nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,852 Commits 53 Branches 630 Tags 128 MiB
d770e20b4f
Commit Graph

37852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Goulet
d770e20b4f Merge branch 'maint-0.4.6' 2022-02-04 12:36:40 -05:00
Tor CI Release
5afdc851b2 version: Bump version to 0.4.6.10-dev 2022-02-04 12:36:31 -05:00
David Goulet
a2be0c590c Merge branch 'maint-0.4.5' into maint-0.4.6 2022-02-04 12:36:19 -05:00
Tor CI Release
92b4e4d041 version: Bump version to 0.4.5.12-dev 2022-02-04 12:36:01 -05:00
David Goulet
3f613b09fa Merge branch 'maint-0.4.6' 2022-02-04 11:10:17 -05:00
Tor CI Release
81a4f92b64 version: Bump version to 0.4.6.10 2022-02-04 11:09:56 -05:00
David Goulet
6e89d0d2b3 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-02-04 11:09:38 -05:00
Tor CI Release
774374ebf5 version: Bump version to 0.4.5.12 2022-02-04 11:09:12 -05:00
David Goulet
d0d45a97d8 Merge branch 'maint-0.4.6' 2022-02-04 11:07:34 -05:00
David Goulet
728191fc2e Merge branch 'maint-0.4.5' into maint-0.4.6 2022-02-04 11:07:34 -05:00
Tor CI Release
6a6332a683 fallbackdir: Update list generated on February 04, 2022 2022-02-04 11:05:21 -05:00
Tor CI Release
5ab4fa9fd8 Update geoip files to match ipfire location db, 2022/02/04. 2022-02-04 11:05:13 -05:00
David Goulet
4400293ee4 Merge branch 'maint-0.4.6' 2022-02-04 10:56:33 -05:00
David Goulet
1c0f56bc3f Merge branch 'maint-0.4.5' into maint-0.4.6 2022-02-04 10:56:33 -05:00
Tor CI Release
cfe022d01d Update geoip files to match ipfire location db, 2021/12/15. 2022-02-04 10:56:29 -05:00
David Goulet
969bda2bd1 Merge branch 'maint-0.4.6' 2022-02-04 10:18:26 -05:00
David Goulet
d69a994d46 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-02-04 10:18:25 -05:00
Tor CI Release
f03cab5dbb fallbackdir: Update list generated on December 15, 2021 2022-02-04 10:17:10 -05:00
David Goulet
d6f643e4dd changes: Remove uneeded file due to empty merge forward 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-02-03 08:31:49 -05:00
David Goulet
6b06803e0d Merge branch 'maint-0.4.6' 2022-02-03 08:30:59 -05:00
David Goulet
a08b12568e Merge branch 'maint-0.4.5' into maint-0.4.6 2022-02-03 08:30:40 -05:00
David Goulet
3c73622f27 hs: Double quote the metrics label value 
Fixes #40552

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-02-03 08:30:23 -05:00
Alexander Færøy
b6ec7fad0e Merge remote-tracking branch 'tor-gitlab/mr/506' into main 2022-01-25 21:53:30 +00:00
Alexander Færøy
118e31b750 Merge remote-tracking branch 'tor-gitlab/mr/507' into main 2022-01-25 21:52:31 +00:00
Alexander Færøy
8771199e6b Merge remote-tracking branch 'tor-gitlab/mr/513' into main 2022-01-25 21:42:44 +00:00
David Goulet
29b058444c doc: More clarification of the release process steps 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-01-24 13:18:39 -05:00
Nick Mathewson
e02d160793 Try to clarify maint vs release issues on ReleasingTor.md 
I've tried to clarify what happens on "maint" vs what happens on
"release".  I'm not sure I've got it right wrt the patches generated
by the scripts, though, so please review carefully and second-guess
everything I'm saying here. :)
 2022-01-24 11:51:08 -05:00
David Goulet
bc500804fd Merge branch 'maint-0.4.5' into maint-0.4.6 2022-01-24 10:49:41 -05:00
David Goulet
0a8e410e15 Merge branch 'maint-0.4.6' 2022-01-24 10:49:41 -05:00
David Goulet
1b58399b07 Merge branch 'maint-0.3.5' into maint-0.4.5 2022-01-24 10:49:32 -05:00
David Goulet
421ce94395 version: Bump version to 0.3.5.18 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-01-24 10:48:15 -05:00
David Goulet
28881d0a92 fallbackdir: Update list generated on January 24, 2022 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-01-24 10:35:18 -05:00
David Goulet
324ded93be geoip: Update to match ipfire location db, 2022/01/24. 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-01-24 10:31:43 -05:00
Nick Mathewson
7a3d60d471 Use an alternative solution to the warning in trace_probes_cc.c 2022-01-20 14:46:38 -05:00
Nick Mathewson
935d7b5803 Resolve typedef conflict from congestion_control_t 
Resumes being able to build on old / esoteric gcc versions.

Fixes bug 40550; bugfix on 0.4.7.1-alpha.
 2022-01-20 14:22:00 -05:00
David Goulet
222fbba4ff relay: Fix memory leak on BUG() code path 
Introduced in bf10206e9e which is not
released yet thus no changes file.

Found by Coverity with cid #1495786.

Fixes #40532

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-01-19 14:01:34 -05:00
David Goulet
0f9967c945 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-01-19 13:56:43 -05:00
David Goulet
8e407e3329 Merge branch 'maint-0.4.6' 2022-01-19 13:56:43 -05:00
David Goulet
986730e82c test: Remove HSv2 protover specific test 
HSv2 is not advertised as a supported protocol version anymore.

This was introduced with the merge-forward of commit 72041c6306
which didn't fix the unit test.

Fixes #40549

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2022-01-19 13:36:23 -05:00
David Goulet
4d60ab8fb7 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-01-18 13:15:38 -05:00
David Goulet
162c9f1b81 Merge branch 'maint-0.4.6' 2022-01-18 13:15:38 -05:00
David Goulet
4ab4521c31 Merge branch 'maint-0.3.5' into maint-0.4.5 2022-01-18 13:15:38 -05:00
David Goulet
501d8bbd4c Merge branch 'tor-gitlab/mr/511' into maint-0.3.5 2022-01-18 13:15:33 -05:00
David Goulet
ec5611e876 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-01-18 13:15:29 -05:00
David Goulet
e949586889 Merge branch 'maint-0.4.6' 2022-01-18 13:15:29 -05:00
David Goulet
49c758af47 Merge branch 'maint-0.3.5' into maint-0.4.5 2022-01-18 13:15:29 -05:00
David Goulet
e523480691 Merge branch 'tor-gitlab/mr/510' into maint-0.3.5 2022-01-18 13:15:23 -05:00
David Goulet
7d9d769123 Merge branch 'maint-0.4.5' into maint-0.4.6 2022-01-18 13:12:35 -05:00
David Goulet
a4510603f7 Merge branch 'maint-0.4.6' 2022-01-18 13:12:35 -05:00
David Goulet
aac5731f86 Merge branch 'maint-0.3.5' into maint-0.4.5 2022-01-18 13:12:13 -05:00