084a5a13c7
Merge branch 'bug27963_wallclock'
2018-11-02 09:38:26 -04:00
f60607ee96
Improve log message in hs_service.c
...
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net >
2018-11-01 12:40:52 +02:00
383b44553c
Merge branch 'ticket24393_036_01_squashed'
2018-10-31 11:07:15 -04:00
e9adc200aa
Add test for nodes_in_same_family()
2018-10-31 11:07:03 -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
158db532eb
Merge branch 'maint-0.3.3' into maint-0.3.4
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
a182301152
Fix memory leak ( #28257 , CID 1440805).
2018-10-31 08:30:48 -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
cdb065d6b2
Merge branch 'maint-0.3.5'
2018-10-30 10:55:10 -04:00
cd9914d9f9
Add test for HiddenServiceAuthorizeClient and v3 onion services
2018-10-30 10:49:03 -04:00
82b3a02302
Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion
2018-10-30 10:48:56 -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
1425549ca6
Code cleanups for tor_addr_parse()
2018-10-30 09:05:11 -04:00
742cd15649
Move a check for trailing colon to tor_inet_pton()
...
That way, string_is_valid_ipv6_address() can benefit from it
2018-10-30 09:05:11 -04:00
c19bb4d62e
Merge branch 'maint-0.3.5'
2018-10-30 08:45:49 -04:00
262b0fe7a0
Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5
2018-10-30 08:39:57 -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
1dcaeab466
Merge remote-tracking branch 'tor-github/pr/446'
2018-10-29 14:49:15 -04:00
8285784966
Only pass -C default-linker-libraries with sanitizers
...
This'll help retain test compatibility until 1.31.0 is released!
2018-10-29 10:00:23 -07:00
5c2212c734
HSv3: Correctly memwipe client auth keystream.
...
Wipe the whole thing, not just the size of the pointer.
2018-10-26 14:55:17 +03:00
b7edfcbf6b
In configured_nameserver_address, check if tor_addr_from_sockaddr succeeded
2018-10-26 10:26:47 +03:00
52a82bc53c
Add a couple more checks to test_parsecommon.c
...
These checks should make coverity stop giving us a "dereference
before null check" warning here.
2018-10-25 09:24:30 -04: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
0878bb961f
Fix two other cases of (buf + N > end) pattern
...
Related to fix for 28202.
2018-10-25 09:08:02 -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
76da5f8b80
Merge branch 'ticket28177'
2018-10-24 12:59:51 -04:00
594140574e
Fix remaining cases of using consensus without a len parameter.
...
(Thanks to cyberpunks for noting two of them!)
2018-10-24 11:06:34 -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
c0bd800d26
Re-alphabetize the list of tests in tests.[ch]
2018-10-24 09:09:40 -04:00
c6d3bebb1e
Merge remote-tracking branch 'tor-github/pr/409'
2018-10-24 09:06:29 -04:00
c3e14a3236
Merge branch 'maint-0.3.5'
2018-10-24 09:02:06 -04:00
bfab7b9d35
rust/tor_log: fix C_RUST_COUPLED documentation
...
This file was moved in 97b15a1d7ce7f5f48d68
2018-10-24 09:02:04 -04:00
fd6078b33a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-23 19:50:53 -04:00
Nick Mathewson
Fernando Fernandez Mancera
Neel Chauhan
David Goulet
rl1987
Alex Crichton
George Kadianakis
cypherpunks