mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-28 08:54:24 +01:00
Code Issues Projects Releases Wiki Activity
35745 commits 53 branches 632 tags 102 MiB
Commit graph

35745 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Færøy
be7386a654 Merge branch 'maint-0.4.4' 2020-06-30 13:48:49 +00:00
Alexander Færøy
aced9be224 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 13:48:49 +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
9e4b47233b Merge branch 'maint-0.4.4' 2020-06-30 13:37:20 +00:00
Alexander Færøy
21cf91ee2c Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 13:37:20 +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
Alexander Færøy
96876d3ad7 Merge branch 'tor-github/pr/1940' 2020-06-30 01:22:44 +00:00
Nick Mathewson
feddba6f8b Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:57:50 -04:00
Nick Mathewson
86aa84e634 Merge branch 'maint-0.4.4' 2020-06-29 13:57:50 -04: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
b2ce815bd8 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:56:16 -04:00
Nick Mathewson
5b47a58d16 Merge branch 'maint-0.4.4' 2020-06-29 13:56:16 -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
9e85515f83 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:48:32 -04:00
Nick Mathewson
def7844c4f Merge branch 'maint-0.4.4' 2020-06-29 13:48:32 -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
6fb31bb34a Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:58:50 -04:00
Nick Mathewson
6b71cc64cf Merge branch 'maint-0.4.4' 2020-06-29 12:58:50 -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
41a4243901 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:56:50 -04:00
Nick Mathewson
ea3a25ff51 Merge branch 'maint-0.4.4' 2020-06-29 12:56:50 -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
2c61f22e43 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:55:35 -04:00
Nick Mathewson
c2843f9fe4 Merge branch 'maint-0.4.4' 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
Alexander Færøy
f1932265fc Merge branch 'dgoulet/tor-ticket40008_045_01' 2020-06-29 14:09:53 +00:00
Nick Mathewson
5336ac2669 Move remaining CodeStructure.md contents into doxygen. 2020-06-26 10:11:42 -04:00
Nick Mathewson
e269e081a1 Remove changes files that appeared in tor 0.4.4.1-alpha. 2020-06-26 09:50:57 -04:00
Nick Mathewson
dbc2b75009 Merge branch 'assume_reachable_revamp' 2020-06-26 08:34:56 -04:00
Nick Mathewson
cb25f57724 Remove stub macro for router_new_consensus_params() 
I had incorrectly believed that the router.c file was disabled when
we were building with relay mode disabled.
 2020-06-26 08:32:33 -04:00
David Goulet
40922629fe addr: Look at /48 for IPv6 in is_local_addr() 
Closes #33618

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-06-25 13:45:05 -04:00
David Goulet
069566b40a Merge branch 'tor-github/pr/1951' 2020-06-25 13:41:45 -04:00
David Goulet
374626c09b Merge branch 'tor-github/pr/1917' 2020-06-25 13:35:34 -04:00
Neel Chauhan
7b2ab93f65 Add test for fingerprint-ed25519 file 2020-06-25 13:35:15 -04:00
Neel Chauhan
ef563a8fef Add an fingerprint-ed25519 file to the data directory 2020-06-25 13:35:15 -04:00
David Goulet
dc4f3a219f Merge branch 'tor-github/pr/1948' 2020-06-25 10:13:04 -04:00
Nick Mathewson
50abc06d84 Remove now-unused OPTIONS_DUMP_DEFAULTS. 2020-06-25 10:02:17 -04:00
Nick Mathewson
62e1d983cf Deprecate the "--dump-config non-builtin" option 
When it works, "non-builtin" doesn't do anything different from
"short".  (When it doesn't work, it gives an assertion failure.)

Closes ticket #33398.
 2020-06-25 10:01:40 -04:00
David Goulet
c370b4a049 Merge branch 'maint-0.4.4' 2020-06-25 07:36:56 -04:00
David Goulet
fd5b2d0f1c Merge branch 'tor-github/pr/1935' 2020-06-24 15:48:47 -04:00