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
262b0fe7a0
Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5
2018-10-30 08:39:57 -04:00
ed8a853bd8
Merge branch 'ticket28225_036_01_squashed'
2018-10-29 16:30:44 -04:00
91748cd17c
doc: Add Maintaining.md documentation
...
Closes #28225
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-10-29 16:30:34 -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
fda8b5de78
Merge branch 'maint-0.3.5'
2018-10-29 15:57:31 -04:00
9d75f79846
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-29 15:57:31 -04:00
c4b6b57388
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-29 15:57:31 -04:00
ccdb7a1cf9
Make sure we're not running distcheck and test-stem on the same CI job
2018-10-29 15:18:07 -04:00
739b22c23a
Log stem commit id
2018-10-29 15:18:07 -04:00
4fd4e27163
Try putting stem repo cloning into install part of config
...
Also print stem version when we have it downloaded
2018-10-29 15:18:07 -04:00
bee9093b55
Save time in CI test-stem job
...
When running `make test-stem` on Travis, we should refrain from
also running `make check`. Furthermore, let's limit compilation
to src/app/tor target.
2018-10-29 15:18:07 -04:00
cf434b6c80
Add changes file
2018-10-29 15:18:07 -04:00
4184aa0ff7
Try running test-stem on travis
2018-10-29 15:18:07 -04:00
b43c446523
Merge remote-tracking branch 'tor-github/pr/447'
2018-10-29 14:51:00 -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
b0c456e578
doc: Use `` for commands and "" for quotes in ReleasingTor.md
2018-10-29 13:49:47 +10:00
fe89d9df69
doc: Spell make test-network-all correctly in ReleasingTor.md
...
Closes ticket 28821.
2018-10-29 13:47:43 +10: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
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
31ecbce3b8
Merge branch 'maint-0.3.5'
2018-10-24 12:57:26 -04:00
c78904b630
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid taking a second instance of 27797.
2018-10-24 12:57:14 -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
3dc5cce749
Merge branch 'maint-0.3.5'
2018-10-24 08:57:28 -04:00
98e28efa8c
Merge branch 'nss-travis' into maint-0.3.5
2018-10-24 08:57:22 -04:00
5db592522a
Merge branch 'maint-0.3.5'
2018-10-23 19:54:16 -04:00
131ab9d523
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" version to avoid removing rust use declaration.
2018-10-23 19:54:04 -04:00
fd6078b33a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-23 19:50:53 -04:00
b2c52f5d6d
Remove a now-unused rust "use".
2018-10-23 19:50:45 -04:00
05d65cb067
Merge branch 'maint-0.3.5'
2018-10-23 19:22:05 -04:00
289a7dbac3
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-23 19:21:44 -04:00
7edc594ee7
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-23 19:18:23 -04:00
169bc670dd
Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
2018-10-23 19:17:48 -04:00
afc22ec539
Merge remote-tracking branch 'tor-github/pr/421'
2018-10-22 08:49:55 -04:00
7aa9fc1637
clean up a tor2web comment
2018-10-21 23:46:09 -04:00
275e831cea
Merge remote-tracking branch 'tor-github/pr/396'
2018-10-19 14:29:01 -04:00
Nick Mathewson
David Goulet
rl1987
Alex Crichton
teor
George Kadianakis
cypherpunks
Roger Dingledine