George Kadianakis
5d79b43717
Merge branch 'maint-0.4.3'
2020-05-28 12:52:48 +03: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
George Kadianakis
8d8a9d7f1d
Merge branch 'tor-github/pr/1898'
2020-05-27 15:17:55 +03:00
Neel Chauhan
f6943d702c
Add changes file for ticket #24844
2020-05-27 15:16:39 +03:00
Neel Chauhan
fd5ea48c27
Add HS v3 status to the SIGUSR1 dumpstats()
2020-05-27 15:16:39 +03:00
Nick Mathewson
43f4324e29
Merge remote-tracking branch 'tor-github/pr/1899/head'
2020-05-21 10:08:48 -04:00
George Kadianakis
3121e5c103
Merge branch 'tor-github/pr/1850'
2020-05-21 16:24:32 +03:00
George Kadianakis
fb281daf29
Merge branch 'tor-github/pr/1861'
2020-05-21 16:22:47 +03:00
Damon Harris
c4fb3bfed5
Add support for console control signals in Windows
2020-05-20 23:28:39 +05:30
David Goulet
ca13249dcc
Merge branch 'tor-github/pr/1886'
2020-05-19 15:18:17 -04:00
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
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
e75583e71b
Merge branch 'maint-0.4.1' into maint-0.4.2
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