8464f44338
Merge branch 'maint-0.3.3' into release-0.3.3
2018-10-10 11:34:48 -04:00
b057623bed
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-10 11:34:48 -04:00
119df9c1c0
Update geoip and geoip6 to the October 9 2018 database.
2018-10-10 17:26:41 +02:00
396b949111
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-21 09:35:54 -04:00
2cadd93cea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-21 09:35:51 -04:00
5b04392c15
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-21 09:35:23 -04:00
f466548e03
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-18 08:31:14 -04:00
75b95e1c8e
Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3
2018-09-18 08:31:08 -04:00
d7ce4a9d7d
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-14 12:56:30 -04:00
a546e07600
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-14 12:56:30 -04:00
0971b3ce4d
hs-v3: Don't BUG() on directory permission check failure
...
In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.
Fixes #27335
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-09-14 12:56:26 -04:00
c613d55134
rust/protover: use .and_not_in() instead of .retain() in all_supported()
...
.retain() would allocating a Vec of billions of integers and check them
one at a time to separate the supported versions from the unsupported.
This leads to a memory DoS.
Closes ticket 27206. Bugfix on e6625113c9
2018-09-14 15:08:55 +00:00
e80db7943e
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-14 10:48:01 -04:00
281854bab7
If options_act() fails, restore the previous value of global_options
...
Before 0.3.3.1-alpha, we would exit() in this case immediately. But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.
Fixes bug 27708; bugfix on 0.3.3.1-alpha.
2018-09-14 10:34:45 -04:00
a2823f106b
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-14 09:25:34 -04:00
e24195c7c1
protover: reject invalid protocol names
...
The spec only allows the characters [A-Za-z0-9-].
Fix on b2b2e1c7f2Fixes #27316 ; bugfix on 0.2.9.4-alpha.
2018-09-14 02:18:04 +00:00
7c26f88fd7
rust/protover: validate unknown protocol names use only allowed characters
2018-09-13 16:33:58 +00:00
9697c2da46
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-13 11:46:04 -04:00
7597340b32
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-13 11:46:04 -04:00
8253428253
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-13 11:46:04 -04:00
dc087f3627
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-12 17:24:41 -04:00
4fa46fca8e
fixup! changes file
2018-09-12 14:22:31 +00:00
73a37d1e54
Check waitpid return value and exit status in tinytest.c
...
It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit. Notably, this happens on a
leak sanitizer failure.
Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
2018-09-12 08:57:18 -04:00
03c4d0ab9c
rust/protover: fix check for overlapping ranges
...
Closes ticket 27649. Bugfix on e6625113c9
2018-09-12 02:47:59 +00:00
1239fcfc37
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-11 15:53:06 -04:00
ae1aea4cc4
Bug 25505: Check circuitmux queues before padding.
2018-09-11 15:53:03 -04:00
95f06d61d0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-11 13:09:21 -04:00
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
c3a750486c
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
2018-09-11 13:09:04 -04:00
198b6354e6
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
2018-09-11 13:08:57 -04:00
7df92c0e0c
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-11 12:04:56 -04:00
8afc100cb5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 12:04:56 -04:00
3119cb5062
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 12:04:55 -04:00
19429fac23
Update geoip and geoip6 to the September 6 2018 database.
2018-09-11 09:26:59 +02:00
d1d9ea4aff
Remove folded-in changes file (0.3.3.10)
2018-09-07 15:55:17 -04:00
2810451265
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-07 09:15:56 -04:00
732ea9120c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 09:15:56 -04:00
0366ae224c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 09:15:52 -04:00
2ec88a2a6d
Tell openssl to build its TLS contexts with security level 1
...
Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.
2018-09-07 09:15:06 -04:00
1e50b0e884
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-07 08:46:45 -04:00
056003d602
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:46:45 -04:00
eacaff6ccc
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
2018-09-07 08:46:41 -04:00
9fcb3ef787
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
2018-09-07 08:46:35 -04:00
1a3f9f377c
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-07 08:44:40 -04:00
df18cf0e8f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:44:40 -04:00
a5ed62f96c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:44:39 -04:00
912ae2b8dc
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
2018-09-07 08:44:36 -04:00
340607639c
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-07 08:42:19 -04:00
08d5fd39d8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:42:19 -04:00
a08e6e711f
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:42:19 -04:00
Nick Mathewson
Karsten Loesing
David Goulet
cypherpunks
Mike Perry