Nick Mathewson
17fa498874
Merge branch 'maint-0.3.0'
2017-02-27 08:38:52 -05:00
Nick Mathewson
b6efd77ec4
Merge remote-tracking branch 'public/bug21472_030' into maint-0.3.0
2017-02-27 08:38:14 -05:00
Nick Mathewson
02aaa7f9ed
Merge branch 'maint-0.3.0'
2017-02-24 11:37:41 -05:00
Nick Mathewson
619771f60b
Whitespace fix.
2017-02-24 11:37:33 -05:00
Nick Mathewson
d73755e36e
Merge branch 'maint-0.3.0'
2017-02-24 11:37:04 -05:00
David Goulet
4ed10e5053
hs: Fix bad use of sizeof() when encoding ESTABLISH_INTRO legacy cell
...
When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() on a
pointer instead of using the real size of the destination buffer leading to an
overflow passing an enormous value to the signing digest function.
Fortunately, that value was only used to make sure the destination buffer
length was big enough for the key size and in this case it always was because
of the overflow.
Fixes #21553
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-02-24 11:36:36 -05:00
Nick Mathewson
5e08fc8557
Also allow C_MEASURE_TIMEOUT circuits to lack guard state.
...
Fixes a case of 21007; bugfix on 0.3.0.1-alpha when prop271 was
implemented. Found by toralf.
2017-02-24 11:12:21 -05:00
Nick Mathewson
4d3310932a
Small fixes to fuzzing documentation.
2017-02-24 10:57:58 -05:00
teor
7a65abf566
Make display of captured unit test log messages consistent
...
There was a missing space and an extra colon.
Fixes bug 21510; bugfix on 0.2.9.3-alpha.
2017-02-19 23:09:50 +11:00
teor
2c45e58bf1
Changes file for 21470
2017-02-19 22:51:50 +11:00
teor
590bfe3d6d
Reject versions that have non-numeric prefixes
...
Unit tests #21507 .
Part of #21470 .
2017-02-19 22:47:47 +11:00
teor
6d0b1a8997
Add unit tests that ensure out of range versions are rejected
...
Unit tests for #21278 .
Part of #21470 .
2017-02-19 22:46:42 +11:00
teor
b3e139581b
Add unit tests for version parsing integer size inconsistencies
...
Unit tests for #21450 .
Part of #21470 .
2017-02-19 22:45:25 +11:00
teor
e34a209df1
Add unit tests for current tor version git tags
...
Related to #21470
2017-02-19 22:44:07 +11:00
teor
3c39dab433
Add unit tests for the current range of tor version status tags
...
Related to #21470 .
2017-02-19 22:42:44 +11:00
teor
57154e71aa
Reject Tor versions that contain non-numeric prefixes
...
strto* and _atoi64 accept +, -, and various whitespace before numeric
characters. And permitted whitespace is different between POSIX and Windows.
Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1.
2017-02-19 22:38:06 +11:00
Nick Mathewson
aec45bc0b1
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-02-17 17:10:47 -05:00
Nick Mathewson
efa5bbaba0
Merge branch 'maint-0.3.0'
2017-02-17 11:47:49 -05:00
Nick Mathewson
823fb68a14
Remove a redundant check in ..transition_affects_guards()
...
scan-build found that we we checking UseEntryGuards twice.
Fixes bug 21492.
2017-02-17 11:47:25 -05:00
Nick Mathewson
9b1d99018b
Merge branch 'maint-0.3.0'
2017-02-17 11:33:04 -05:00
Nick Mathewson
5dbbd6bc39
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-02-17 11:32:45 -05:00
Nick Mathewson
67cec7578c
Check for micro < 0, rather than checking "minor" twice.
...
Bug found with clang scan-build. Fixes bug on f63e06d3dc
2017-02-17 11:31:39 -05:00
Nick Mathewson
d3f0f10efd
Fix memleak in test_getinfo_helper_onion.
...
Fix on fc58c37e33
2017-02-17 10:08:31 -05:00
Nick Mathewson
d004b9222e
The UseCreateFast consensus parameter now defaults to 0.
...
You can still override it with FastFirstHopPK. But that's
deprecated.
Closes ticket 21407.
2017-02-16 15:30:26 -05:00
Alexander Færøy
3848d23643
Save number of sent/received RELAY_DATA cells for directory connections.
...
This patch makes us store the number of sent and received RELAY_DATA
cells used for directory connections. We log the numbers after we have
received an EOF in connection_dir_client_reached_eof() from the
directory server.
2017-02-16 15:11:53 +00:00
Nick Mathewson
31be66ea5a
Merge remote-tracking branch 'meejah/ticket-21329-onions-current'
2017-02-16 09:40:56 -05:00
Nick Mathewson
832d4636f5
Bump master to 0.3.1.0-alpha-dev
2017-02-15 14:36:56 -05:00
David Goulet
3336f26e60
hs: Avoid a strlen(NULL) if descriptor is not found in cache
...
Instead of returning 404 error code, this led to a NULL pointer being used and
thus a crash of tor.
Fixes #21471
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-02-15 10:27:41 -05:00
Nick Mathewson
d633c4757c
Merge branch 'maint-0.2.9'
2017-02-15 08:19:51 -05:00
Nick Mathewson
fea93abecd
whoops; make 21450 compile
2017-02-15 08:19:37 -05:00
Nick Mathewson
39af9fc2b7
Merge branch 'bug21447'
2017-02-15 08:08:25 -05:00
Nick Mathewson
62f98ad485
Merge branch 'maint-0.2.9'
2017-02-15 07:58:15 -05:00
Nick Mathewson
cb6b3b7cad
Limit version numbers to 0...INT32_MAX.
...
Closes 21450; patch from teor.
2017-02-15 07:57:34 -05:00
Nick Mathewson
1fbff411b2
Merge branch 'maint-0.2.9'
2017-02-15 07:53:01 -05:00
Nick Mathewson
a1c3b391de
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-15 07:52:54 -05:00
Nick Mathewson
5222054163
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-15 07:52:47 -05:00
Nick Mathewson
e6376a8004
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-15 07:52:41 -05:00
Nick Mathewson
f7ed4a7d8f
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-15 07:52:33 -05:00
Nick Mathewson
71cd68b66b
Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8
2017-02-15 07:51:57 -05:00
Nick Mathewson
67877f55ad
Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7
2017-02-15 07:51:48 -05:00
Nick Mathewson
6e7ff9ee31
Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6
2017-02-15 07:51:41 -05:00
Nick Mathewson
aeb299ba6d
Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5
2017-02-15 07:51:33 -05:00
Nick Mathewson
76d79d597a
Merge branch 'maint-0.2.9'
2017-02-15 07:48:42 -05:00
Nick Mathewson
5d88267bf4
Merge branch 'bug21278_extra_029' into maint-0.2.9
2017-02-15 07:48:30 -05:00
Nick Mathewson
ec6b5a098d
Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9
2017-02-15 07:48:18 -05:00
Nick Mathewson
eeb743588a
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-02-15 07:48:10 -05:00
Nick Mathewson
1ebdae6171
Merge branch 'maint-0.2.7' into maint-0.2.8
2017-02-15 07:47:28 -05:00
Nick Mathewson
ed806843dc
Merge branch 'maint-0.2.6' into maint-0.2.7
2017-02-15 07:47:21 -05:00
Nick Mathewson
3781f24b80
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-15 07:47:12 -05:00
Nick Mathewson
a452b71395
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-15 07:47:04 -05:00
