865514e66e
Merge branch 'ticket28100_squashed'
2018-11-02 13:19:24 -04:00
1b75de85b3
Don't overwrite the Content-Type when compressing
2018-11-02 13:19:14 -04:00
f0bd6c2c9d
Merge branch 'maint-0.3.5'
2018-11-02 13:14:37 -04:00
996f24fcd3
Merge branch 'bug27968_squashed' into maint-0.3.5
2018-11-02 13:14:32 -04:00
8f43b8fb47
Avoid a race condition in test_rebind.py
...
If tor terminates due to SIGNAL HALT before test_rebind.py calls
tor_process.terminate(), an OSError 3 (no such process) is thrown.
Fixes part of bug 27968 on 0.3.5.1-alpha.
2018-11-02 13:14:23 -04:00
f27279f857
Merge remote-tracking branch 'tor-github/pr/449'
2018-11-02 13:11:26 -04:00
d671e3f513
Merge remote-tracking branch 'tor-github/pr/448'
2018-11-02 13:09:45 -04:00
f57fd0318a
Merge remote-tracking branch 'tor-github/pr/397'
2018-11-02 10:01:26 -04:00
a6c7e01584
Merge branch 'bug27963_wallclock' into maint-0.3.5
2018-11-02 09:39:13 -04:00
084a5a13c7
Merge branch 'bug27963_wallclock'
2018-11-02 09:38:26 -04:00
a0402c6f33
Add changes file for #27707 .
2018-11-01 12:40:52 +02:00
383b44553c
Merge branch 'ticket24393_036_01_squashed'
2018-10-31 11:07:15 -04:00
0d124488f8
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-31 11:02:58 -04:00
158db532eb
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-31 11:01:41 -04:00
2a4506776e
Merge branch 'maint-0.3.5'
2018-10-31 11:01:41 -04:00
59043665f8
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-31 11:01:41 -04:00
bcc1a71808
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-31 11:01:40 -04:00
0a824bd889
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
2018-10-31 11:01:36 -04:00
988d4903a3
Merge branch 'networkstatus_mmap' into networkstatus_mmap_merge
2018-10-31 09:04:12 -04:00
067b16eae2
Check IPv6 subnets as well as IPv4 subnets where possible when choosing client paths
2018-10-30 15:02:43 -04:00
aa1ae1343a
Merge branch 'maint-0.3.5'
2018-10-30 11:44:14 -04:00
488969fe9c
Merge branch 'tor-github/pr/438' into maint-0.3.5
2018-10-30 11:43:54 -04:00
124c43704c
Merge branch 'maint-0.3.5'
2018-10-30 11:37:44 -04:00
95559279e1
Merge branch 'tor-github/pr/415' into maint-0.3.5
2018-10-30 11:36:36 -04:00
1c5c3f353a
Merge branch 'maint-0.3.5'
2018-10-30 11:29:30 -04:00
6c9d678ff6
hs-v3: Add changes file for 28026
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-10-30 11:28:53 -04:00
cdb065d6b2
Merge branch 'maint-0.3.5'
2018-10-30 10:55:10 -04:00
9b72dca953
Add changes file for Bug #28127
2018-10-30 10:49:03 -04:00
6ba7f9f0a4
Merge branch 'maint-0.3.5'
2018-10-30 09:35:11 -04:00
97324a731f
Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
2018-10-30 09:35:07 -04:00
cf2cb783b7
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-30 09:34:04 -04:00
038bc21f88
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
2018-10-30 09:33:36 -04:00
30d853a906
Merge remote-tracking branch 'tor-github/pr/425'
2018-10-30 09:16:55 -04:00
084924360a
Merge branch 'ticket23082_squashed'
2018-10-30 09:05:42 -04:00
c19bb4d62e
Merge branch 'maint-0.3.5'
2018-10-30 08:45:49 -04:00
ee1cc0feae
Add a changes file for Alex Crichton's rust fixes.
2018-10-30 08:45:37 -04:00
f6faa76817
Merge branch 'maint-0.3.5'
2018-10-29 15:59:11 -04:00
709cd447f0
Merge branch '27913_rebased_035' into maint-0.3.5
2018-10-29 15:59:06 -04:00
c4b6b57388
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-29 15:57:31 -04:00
fda8b5de78
Merge branch 'maint-0.3.5'
2018-10-29 15:57:31 -04:00
cf434b6c80
Add changes file
2018-10-29 15:18:07 -04:00
5a3cb495ce
Add changes file
2018-10-29 11:41:36 +02:00
4af27e0168
Add changes file
2018-10-29 11:05:55 +02:00
e9ff3e7d4a
Merge branch 'bug28202_033' into bug28202_035
2018-10-25 09:16:08 -04:00
8013e3e8b6
Merge branch 'bug28202_029' into bug28202_033
2018-10-25 09:14:06 -04:00
368413a321
Fix possible UB in an end-of-string check in get_next_token().
...
Remember, you can't check to see if there are N bytes left in a
buffer by doing (buf + N < end), since the buf + N computation might
take you off the end of the buffer and result in undefined behavior.
Fixes 28202; bugfix on 0.2.0.3-alpha.
2018-10-25 09:06:13 -04:00
b063ca0604
node: Make node_supports_v3_rendezvous_point() also check for the key
...
It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.
Fixes #27797 .
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-10-24 10:30:26 -04:00
b77889fc5f
Merge branch 'maint-0.3.5'
2018-10-24 10:20:53 -04:00
6851a08090
Merge branch 'ticket28115_035' into maint-0.3.5
2018-10-24 10:20:41 -04:00
c6d3bebb1e
Merge remote-tracking branch 'tor-github/pr/409'
2018-10-24 09:06:29 -04:00
Nick Mathewson
Alex Xu (Hello71)
teor
George Kadianakis
Neel Chauhan
David Goulet
rl1987