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
5c47f725b0
rust/protover: delete ProtoSet::retain
...
As the comment noted, it was horribly inefficient.
2018-09-14 15:10:22 +00: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
578f7326ed
rust/protover: add ProtoSet::and_not_in()
...
This is a way more efficient version of retain().
2018-09-14 15:08:54 +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
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
c02f2d9eb4
Merge branch 'bug27658_029' into maint-0.2.9
2018-09-13 11:45:58 -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
b88a2f28ae
rust/protover: remove version zero from tests
...
This isn't legal according to dir-spec.txt.
We can write separate tests for it if the spec
is changed to make it legal.
2018-09-12 02:47:59 +00:00
e9ef7d5ab4
test/protover: remove version zero from tests
...
This isn't legal according to dir-spec.txt.
We can write separate tests for it if the spec
is changed to make it legal.
2018-09-12 02:47:29 +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
5a8827a4c9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 13:09:21 -04:00
95f06d61d0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-11 13:09:21 -04:00
1d8957129b
Merge branch 'maint-0.3.2' into maint-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
c6b8f7843a
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-10 09:42:57 -04:00
05f5f65006
Bump to 0.3.3.10-dev.
2018-09-10 09:42:12 -04:00
8cfca28be2
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid version bump.
2018-09-10 09:41:55 -04:00
8408331b3e
Merge branch 'maint-0.2.9' into maint-0.3.2
...
"ours" to avoid version bump.
2018-09-10 09:41:39 -04:00
ec4a7641f1
Bump to 0.3.2.12-dev
2018-09-10 09:41:34 -04:00
b203dedaf5
Bump to 0.2.9.17-dev
2018-09-10 09:41:22 -04:00
2e94df92ca
Copy 0.3.3.10 changelog to releasenotes
2018-09-10 09:12:21 -04:00
e07b692fa1
find and neutralize nickm's easter egg
...
also fix a typo while i'm here
2018-09-07 19:31:33 -04:00
d1d9ea4aff
Remove folded-in changes file (0.3.3.10)
2018-09-07 15:55:17 -04:00
fa2d6d1c0d
Construct changelog for 0.3.3.10
2018-09-07 15:49:33 -04:00
e14da02ed0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-09-07 15:13:59 -04:00
cff7cb858b
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid bump
2018-09-07 15:12:09 -04:00
36885f34f6
Merge branch 'maint-0.2.9' into maint-0.3.2
...
"ours" to avoid bump
2018-09-07 15:11:49 -04:00
43e400f340
Bump to 0.3.3.10
2018-09-07 15:11:18 -04:00
cdaf9aec8e
Bump to 0.3.2.12
2018-09-07 15:11:07 -04:00
da29074fc4
Bump to 0.2.9.17
2018-09-07 15:10:49 -04:00
Nick Mathewson
David Goulet
cypherpunks
Mike Perry
Karsten Loesing
Roger Dingledine