nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,060 Commits 53 Branches 630 Tags 128 MiB
5a38c73f70
Commit Graph

35060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Færøy
5a38c73f70 Merge branch 'tor-github/pr/1887' into maint-0.4.3 2020-06-30 14:19:28 +00:00
Alexander Færøy
fb46d1bb34 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 14:16:16 +00:00
Alexander Færøy
881f50a9a9 Merge branch 'tor-github/pr/1806' into maint-0.4.2 2020-06-30 14:15:57 +00:00
Alexander Færøy
38f3cf4103 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 14:03:04 +00:00
Alexander Færøy
c9c4a3d0f6 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 14:03:04 +00:00
Alexander Færøy
8444fbe904 Merge branch 'tor-github/pr/1793' into maint-0.3.5 2020-06-30 13:55:39 +00:00
Alexander Færøy
2042ebe88e Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 13:48:49 +00:00
Alexander Færøy
483082b57b Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 13:48:49 +00:00
Alexander Færøy
c3ad2a1d23 Merge branch 'tor-github/pr/1785' into maint-0.3.5 2020-06-30 13:47:55 +00:00
Alexander Færøy
c57896a76e Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 13:37:20 +00:00
Alexander Færøy
b0bfee8c78 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 13:37:20 +00:00
Alexander Færøy
bebdd2888f Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 2020-06-30 13:35:13 +00:00
Nick Mathewson
eef77227ef Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:57:41 -04:00
Nick Mathewson
d235e523d5 Merge branch 'ticket33290_v2_042' into maint-0.4.2 2020-06-29 13:57:13 -04:00
Nick Mathewson
d124cfc058 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:56:04 -04:00
Nick Mathewson
a692b87f82 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 2020-06-29 13:53:27 -04:00
Nick Mathewson
31bdfd4920 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:48:32 -04:00
Nick Mathewson
0575a182a6 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 2020-06-29 13:48:25 -04:00
Nick Mathewson
f862971d04 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 12:58:50 -04:00
Nick Mathewson
216456299f Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 2020-06-29 12:58:23 -04:00
Nick Mathewson
3008255aea Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3 2020-06-29 12:56:39 -04:00
Nick Mathewson
fd8ce812b0 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-29 12:55:35 -04:00
Nick Mathewson
183d0d30d6 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 12:55:35 -04:00
Nick Mathewson
0c0214bcc0 Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5 2020-06-29 12:55:27 -04:00
David Goulet
0f218a05a6 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-12 12:55:41 -04:00
David Goulet
272c171136 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-12 12:55:41 -04:00
David Goulet
6a43aadecc Merge branch 'tor-github/pr/1912' into maint-0.3.5 2020-06-12 12:55:17 -04:00
Nick Mathewson
1930828957 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-05 12:37:29 -04:00
Nick Mathewson
754d4e9a17 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-05 12:37:29 -04:00
Alexander Færøy
c1add51bcc Update and upgrade Pacman before installing dependencies in AppVeyor. 
This patch makes sures that AppVeyor upgrades its Pacman (the package
manager) before installing the Tor dependencies.

See: https://bugs.torproject.org/34384
 2020-06-05 12:37:08 -04:00
Nick Mathewson
f49f1d6fb2 Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8" 
This reverts commit e63bfca5f2, now
that Stem has been upgraded to fix the underlying issue.
 2020-06-03 14:48:05 -04:00
George Kadianakis
6b05d447bb Merge branch 'tor-github/pr/1909' into maint-0.4.3 2020-06-02 14:05:33 +03:00
Nick Mathewson
688d1b3f03 Merge remote-tracking branch 'tor-github/pr/1905/head' into maint-0.4.3 2020-06-01 09:47:37 -04:00
Roger Dingledine
39f2411b3f Preemptive circs should work with UseEntryGuards 0 
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469), leading to slower load times.

Fixes bug 34303; bugfix on 0.3.3.2-alpha.
 2020-05-30 02:20:48 -04:00
George Kadianakis
6891d1bbcb Merge branch 'tor-github/pr/1792' into maint-0.4.3 2020-05-28 12:25:57 +03:00
David Goulet
ca356b952e changes: Add changes file for ticket 33458 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-05-28 12:25:42 +03:00
David Goulet
1810771799 hs-v3: Improve accessor semantic of client cached object 
Add an inline helper function that indicates if the cached object contains a
decrypted descriptor or not.

The descriptor object is NULL if tor is unable to decrypt it (lacking client
authorization) and some actions need to be done only when we have a decrypted
object.

This improves code semantic.

Fixes #33458

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-05-28 12:25:42 +03:00
Roger Dingledine
d6186c7435 Man page: MinUptimeHidServDirectoryV2 defaults to 96 hours 
Bugfix on 0.2.6.3-alpha; fixes bug 34299.
 2020-05-23 04:37:57 -04:00
Nick Mathewson
bdb3be0119 Merge branch 'ticket34255_043' into maint-0.4.3 2020-05-19 09:39:04 -04:00
Nick Mathewson
68fe8826dd Doxygen: fix unbalanced groups. 
Closes ticket 34255.
 2020-05-19 09:18:39 -04:00
Nick Mathewson
6f2b6ede1b Add a changes file for 34233. 
This bug was merged back to 0.3.5 with our #34078 fix, but only
released in 0.4.3.5, so the changes file goes here.
 2020-05-15 10:27:49 -04:00
Nick Mathewson
e75583e71b Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-15 10:25:27 -04:00
Nick Mathewson
bcaf480aee Merge branch 'maint-0.4.2' into maint-0.4.3 2020-05-15 10:25:27 -04:00
Nick Mathewson
768ffb8f43 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-15 10:25:27 -04:00
Nick Mathewson
a59d54756f Fix use of non-portable == in configure.ac. 
Fixes bug 34233.

(This has bug has been backported to 0.3.5, but only released in
0.4.3, so it only needs a changes file there.)
 2020-05-15 09:58:49 -04:00
Nick Mathewson
c0dd2a6e39 bump to 0.4.3.5-dev 2020-05-15 09:02:12 -04:00
Nick Mathewson
75fc33f337 bump to 0.4.3.5 2020-05-14 10:37:42 -04:00
Nick Mathewson
b8bff426f3 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-14 10:20:08 -04:00
Nick Mathewson
72312cdbb1 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-14 10:20:08 -04:00
Nick Mathewson
ee6409ab63 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-05-14 10:20:08 -04:00