nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,541 Commits 53 Branches 630 Tags 125 MiB
755b8252a4
Commit Graph

35541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Goulet
ee0fb69fee Merge branch 'tor-github/pr/1897' 2020-05-19 15:17:08 -04:00
David Goulet
5d99985e43 Merge branch 'tor-github/pr/1894' 2020-05-19 15:14:38 -04:00
Nick Mathewson
400bc46d83 doxygen: add a link to src-ref on mainpage.md. 
Closes 34246.
 2020-05-19 09:44:36 -04:00
Nick Mathewson
9b55a62e73 Merge branch 'maint-0.4.3' 2020-05-19 09:39:12 -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
Neel Chauhan
087b466fcf Declare variables in for loops in rend_service_dump_stats() 2020-05-17 15:19:39 -07:00
Neel Chauhan
32e791be09 Fix spacing in if statement in tor_version_parse() 2020-05-16 22:26:30 -07:00
Neel Chauhan
2e0d0360cd Fix spacing in if statement in port_parse_config() 2020-05-16 22:23:59 -07:00
Nick Mathewson
db4815dd8e Merge branch 'maint-0.4.3' 2020-05-15 10:28:36 -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
ec2f6d69d7 Merge branch 'maint-0.4.3' 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
8d59897e58 Merge branch 'maint-0.4.3' 
"ours" to avoid version bump
 2020-05-15 09:02:30 -04:00
Nick Mathewson
c0dd2a6e39 bump to 0.4.3.5-dev 2020-05-15 09:02:12 -04:00
Nick Mathewson
85cfd04c0c remove changes files that have already appeared in 0.4.3. 2020-05-14 20:29:00 -04:00
Nick Mathewson
58dbf83054 remove 0.4.3.3-alpha from the release notes: alphas do not go there. 2020-05-14 11:43:38 -04:00
Nick Mathewson
fbd384cf89 Merge branch 'maint-0.4.3' 
"ours" to avoid 0.4.3.5 version bump.
 2020-05-14 10:38:40 -04:00
Nick Mathewson
bbfdee4c4e Fix a python warning in format_changelog.py. 2020-05-14 10:37:52 -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
371d5ece5b Merge branch 'maint-0.4.3' 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
Nick Mathewson
e63bfca5f2 Travis: temporarily fix stem version to d1174a83c2dcb7b8 
This is a workaround for https://github.com/torproject/stem/issues/63
 2020-05-14 08:08:24 -04:00
Nick Mathewson
1557e73c82 Merge branch 'bug34130_035' 2020-05-12 12:58:19 -04:00
Daniel Pinto
2913dbd6d9 Fix crash when tor is compiled with NSS and seccomp sandbox is enabled 
Adds seccomp rules for socket and getpeername used by NSS
 2020-05-12 12:56:06 -04:00
Nick Mathewson
86b5bcd80a Merge remote-tracking branch 'tor-github/pr/1885/head' 2020-05-12 12:52:41 -04:00
Daniel Pinto
cce16a939c Improve logging of included config files 2020-05-08 01:10:59 +01:00
Daniel Pinto
cc169eb120 Add documentation about %include and seccomp sandbox limitations 2020-05-08 00:21:12 +01:00
Nick Mathewson
b7a165228f Merge remote-tracking branch 'tor-github/pr/1880/head' 2020-05-07 08:19:11 -04:00
Nick Mathewson
3a785dd5be Merge branch 'maint-0.4.3' 2020-05-06 17:17:19 -04:00
Nick Mathewson
b444096be5 Fix a boolean logic error when logging about invalid hostnames. 
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
 2020-05-06 17:15:37 -04:00
Nick Mathewson
b7fcbb28d4 connection_or_finished_flushing(): add a missing "break;" 
This one is harmless like the others (so far)
 2020-05-06 17:09:27 -04:00
Nick Mathewson
e8fdba198e Merge branch 'maint-0.4.2' into maint-0.4.3 2020-05-06 17:07:47 -04:00
Nick Mathewson
b16c1e4cf6 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-06 17:07:27 -04:00
Nick Mathewson
d41f1cd3ed btrack_orconn_cevent.c: Add a missing "break;" 2020-05-06 17:07:12 -04:00
Nick Mathewson
e39b35f1de Merge branch 'maint-0.4.3' 2020-05-06 16:58:12 -04:00
Nick Mathewson
ae1ebb5f44 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-05-06 16:58:12 -04:00
Nick Mathewson
d46f67ef0e Merge branch 'maint-0.4.1' into maint-0.4.2 2020-05-06 16:58:12 -04:00
Nick Mathewson
633366efcd Merge branch 'maint-0.3.5' into maint-0.4.1 2020-05-06 16:58:12 -04:00
Nick Mathewson
dd795fbee4 changes file for bug 34078. 2020-05-06 16:58:06 -04:00
Nick Mathewson
4a2347d290 Merge branch 'maint-0.4.3' 
Amazingly, this time we had no merge conflicts with "falls through" comments.
 2020-05-06 16:55:41 -04:00
Nick Mathewson
c116728209 Use __attribute__((fallthrough)) rather than magic GCC comments. 
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.3 version.)
 2020-05-06 16:55:25 -04:00
Nick Mathewson
a1365b91ff Merge branch 'maint-0.4.2' into maint-0.4.3 
This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.
 2020-05-06 16:54:12 -04:00
Nick Mathewson
28ac17f433 Use __attribute__((fallthrough)) rather than magic GCC comments. 
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.2 version.)
 2020-05-06 16:53:40 -04:00
Nick Mathewson
f954514b37 Merge branch 'maint-0.4.1' into maint-0.4.2 
This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
 2020-05-06 16:53:06 -04:00