Nick Mathewson
7dd5fcb707
Merge branch 'maint-0.2.9'
2017-01-23 14:34:33 -05:00
Nick Mathewson
0d4d9b6d88
Bump version to 0.2.9.9-dev
2017-01-23 14:34:08 -05:00
Roger Dingledine
0668d29354
forward-port the 0.2.9.9 changelog stanza
2017-01-23 09:42:02 -05:00
Nick Mathewson
e760c1b291
forward-port trove-2017-001 entry and blurb.
2017-01-23 09:16:36 -05:00
Nick Mathewson
55eca7a374
Remove an x
2017-01-23 09:09:23 -05:00
Nick Mathewson
4a93ed1ede
Merge branch 'maint-0.2.9'
2017-01-23 08:55:40 -05:00
Nick Mathewson
767516680c
TROVE-2017-001 : move -ftrapv back into --expensive-hardening.
2017-01-23 08:47:10 -05:00
Nick Mathewson
beaeee25ae
version bump (0.3.0.2-alpha)
2017-01-23 08:20:46 -05:00
Nick Mathewson
5a1497c0b7
Merge branch 'maint-0.2.9'
2017-01-23 08:20:13 -05:00
Nick Mathewson
698df98837
version bump
2017-01-23 08:19:48 -05:00
Nick Mathewson
b3ae5753b6
Note "also in 0.2.9.9" for backported entries.
2017-01-23 07:59:02 -05:00
Nick Mathewson
15dd86cc1f
Reflow changelog
2017-01-23 07:56:11 -05:00
Roger Dingledine
4fc0a31287
clean up changelog for 0.3.0.2-alpha release
2017-01-22 22:08:15 -05:00
Roger Dingledine
5066facb23
try to explain bug 20307 better
2017-01-22 20:51:57 -05:00
Nick Mathewson
d78ed9fb73
oh, here it is
2017-01-22 19:40:30 -05:00
Nick Mathewson
5baa3ec06e
Begin 0.3.0.2-alpha changelog
...
(Automated sort and format)
2017-01-22 19:05:50 -05:00
Nick Mathewson
da65bdd320
Merge branch 'maint-0.2.9'
...
"ours" merge to avoid taking cherry-picked 20307 fix
2017-01-22 19:04:02 -05:00
Roger Dingledine
bcbb2d111b
clean up grammar on bug20307 changes file
...
pointed out by toralf on irc
2017-01-22 19:03:12 -05:00
David Goulet
96c7ddbc7e
circuit: Change close reasons from uint16_t to int
...
When marking for close a circuit, the reason value, a integer, was assigned to
a uint16_t converting any negative reasons (internal) to the wrong value. On
the HS side, this was causing the client to flag introduction points to be
unreachable as the internal reason was wrongfully converted to a positive
16bit value leading to flag 2 out of 3 intro points to be unreachable.
Fixes #20307 and partially fixes #21056
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-22 19:02:01 -05:00
Nick Mathewson
955846fbab
Fix warnings from lintchanges script
2017-01-22 18:54:13 -05:00
Nick Mathewson
753f6a9e70
Merge branch 'maint-0.2.9'
2017-01-22 18:48:27 -05:00
Nick Mathewson
46aee42cb9
fix a lintchanges warning
2017-01-22 18:48:22 -05:00
Nick Mathewson
e52f49aa80
Merge remote-tracking branch 'public/ticket18319'
2017-01-21 14:44:00 -05:00
Nick Mathewson
9023d7361d
Fix return type in test_hs_intropoint.c
...
In trunnel, {struct}_encoded_len() can return negative values.
Coverity caught this as 1398957.
2017-01-19 08:26:55 -05:00
teor
d35ca518b4
Remove extra newline from proxy_prepare_for_restart definition
2017-01-19 08:12:26 -05:00
Nick Mathewson
85a17ee2e7
whitespace fixes
2017-01-18 17:14:42 -05:00
Nick Mathewson
88e4ffab9e
Merge remote-tracking branch 'dgoulet/ticket20029_030_06-resquash'
2017-01-18 17:13:36 -05:00
George Kadianakis
d6c14915cd
Improve a few comments.
...
- Also remove LCOV marks from blocks of code that can be reachable by tests
if we mock relay_send_command_from_edge().
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 16:59:16 -05:00
David Goulet
50cfc98340
prop224: Add unit tests for INTRODUCE1 support
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 16:58:54 -05:00
David Goulet
5208085be1
hs: Rename rend_mid_introduce() with legacy semantic
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 16:58:34 -05:00
David Goulet
db77a38da2
hs: Remove useless code in rend_mid_introduce()
...
With the previous commit, we validate the circuit _before_ calling
rend_mid_introduce() which handles the INTRODUCE1 payload.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 16:58:34 -05:00
David Goulet
9d7505a62a
prop224: Rename hs_intro_circuit_is_suitable()
...
Adds a better semantic and it also follows the same interface for the
INTRODUCE1 API which is circuit_is_suitable_for_introduce1().
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 16:58:34 -05:00
David Goulet
e1497744c8
prop224: Add INTRODUCE1 cell relay support
...
Closes #20029
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 16:58:33 -05:00
Nick Mathewson
d5d7c3e638
Remove argument from guards_choose_dirguard
2017-01-18 15:58:19 -05:00
Nick Mathewson
3efe8bb8ac
Remove some now-spurious blocks and indentation.
2017-01-18 15:45:02 -05:00
Nick Mathewson
5b97d7e110
Remove PDS_FOR_GUARD
2017-01-18 15:42:28 -05:00
Nick Mathewson
6d03e36fd0
Remove GS_TYPE_LEGACY
2017-01-18 15:37:01 -05:00
Nick Mathewson
a31a5581ee
Remove UseDeprecatedGuardAlgorithm.
2017-01-18 15:33:26 -05:00
Nick Mathewson
472b277207
Remove the (no longer compiled) code for legacy guard selection.
...
Part of 20830.
2017-01-18 15:27:10 -05:00
Nick Mathewson
e167a0e17d
Merge remote-tracking branch 'dgoulet/bug21062_030_01'
2017-01-18 15:11:36 -05:00
Nick Mathewson
31dd7dec9a
Merge branch 'bug20684_030_01'
2017-01-18 15:08:42 -05:00
Nick Mathewson
e0e729d4b5
put units in constant names for DIRCACHE_MEN_MEM*
2017-01-18 15:08:10 -05:00
Nick Mathewson
9d47f4d298
Fix a memory leak in bench.c
2017-01-18 14:29:52 -05:00
Neel Chauhan
426ceb41ef
Rename DIRCACHE_MIN_BANDWIDTH and DIRCACHE_MIN_MB_BANDWIDTH
...
Renamed to DIRCACHE_MIN_MEM and DIRCACHE_MIN_MB_MEM.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 13:15:54 -05:00
David Goulet
0069d14753
circuit: Make circuit_build_times_disabled take an or_options_t
...
That way, when we are parsing the options and LearnCircuitBuildTimeout is set
to 0, we don't assert trying to get the options list with get_options().
Fixes #21062
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-01-18 12:53:01 -05:00
Nick Mathewson
fa00f2dce5
Merge branch 'ahf_bugs_17847_2_squashed'
2017-01-18 11:04:58 -05:00
Alexander Færøy
46ef32ba22
Refactor duplicated extrainfo checks into a common macro.
...
This patch refactors duplicated code, to check if a given router
supports fetching the extra-info document, into a common macro called
SKIP_MISSING_TRUSTED_EXTRAINFO.
2017-01-18 11:04:49 -05:00
Alexander Færøy
0ff9ea2afd
Generalize router_is_already_dir_fetching_{rs,ds}.
...
This patch generalizes the two functions
router_is_already_dir_fetching_rs and router_is_already_dir_fetching_ds
into a single function, router_is_already_dir_fetching_, by lifting the
passing of the IPv4 & IPv6 addresses and the directory port number to
the caller.
2017-01-18 11:04:49 -05:00
Nick Mathewson
b6dce6cfec
Merge remote-tracking branch 'asn/bug21142'
2017-01-18 10:44:35 -05:00
Nick Mathewson
9469aaaa82
Handle __NonSavedOptions correctly inside LINELIST_V blocks.
2017-01-18 10:25:10 -05:00
