George Kadianakis
c750ec20ab
Merge branch 'tor-github/pr/1291'
2019-09-05 17:09:20 +03:00
George Kadianakis
cdd7e88970
Merge branch 'tor-github/pr/1261'
2019-09-05 17:02:53 +03:00
Neel Chauhan
be4a60945d
Check IPv6 exit policies on microdescriptors in node_exit_policy_rejects_all()
2019-09-05 17:02:45 +03:00
Nick Mathewson
ec724fe8c8
rendclient: use ptrdiff, not off_t, for offset of DH field.
...
The off_t type is only useful for offsets on the filesystem. For
in-memory offsets, use ptrdiff_t.
2019-09-04 12:06:27 -04:00
David Goulet
34f3fcef40
Merge branch 'tor-github/pr/1290'
2019-09-04 10:33:49 -04:00
Nick Mathewson
46a3820652
Merge remote-tracking branch 'tor-github/pr/1270'
2019-09-04 09:52:35 -04:00
Nick Mathewson
17a870a64b
Merge branch 'ticket31240v2_merged_2' into ticket31240v2_merged_2_merged
2019-09-04 08:41:42 -04:00
George Kadianakis
7fa624537c
Merge branch 'tor-github/pr/1269'
2019-09-03 17:11:25 +03:00
Nick Mathewson
a617001fd4
Merge remote-tracking branch 'tor-github/pr/1279'
2019-09-03 09:47:25 -04:00
Nick Mathewson
01bda9bed1
Merge branch 'maint-0.4.1'
2019-09-02 14:11:32 -04:00
Nick Mathewson
e3a458e441
Merge branch 'ticket12399_035' into maint-0.4.1
2019-09-02 14:11:18 -04:00
rl1987
05fa1689eb
Change loglevel of message 'Hash of session info was not as expected'
2019-09-02 14:09:39 -04:00
Neel Chauhan
d22ed05dc0
Space out the arguments to the cell functions in rend_process_relay_cell()
2019-08-30 18:58:00 -04:00
teor
1132dc9f75
Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
2019-08-30 23:24:05 +10:00
teor
b66712d85b
Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5
2019-08-30 23:22:18 +10:00
David Goulet
960d989415
Merge branch 'tor-github/pr/1257'
2019-08-29 08:56:04 -04:00
David Goulet
7c99a4ddde
Merge branch 'maint-0.4.1'
2019-08-29 08:55:58 -04:00
David Goulet
ff905f8e1e
Merge branch 'tor-github/pr/1256' into maint-0.4.1
2019-08-29 08:55:31 -04:00
David Goulet
337b733cfc
Merge branch 'tor-github/pr/1255' into maint-0.4.1
2019-08-29 08:55:27 -04:00
teor
ec6fbf1ca6
nodelist: Use safe string functions in describe.c
...
Rewrite format_node_description() and router_get_verbose_nickname() to
use strlcpy() and strlcat(). The previous implementation used memcpy()
and pointer arithmetic, which was error-prone.
Closes ticket 31545. This is CID 1452819.
2019-08-29 13:09:08 +10:00
Nick Mathewson
f0c1f96adc
Document configuration type definition functions for routerset_t
...
These functions are all used to implement the ROUTERSET_type_defn
object, which maps strings to and from routerset_t configuration
variables for the configuration module.
2019-08-28 12:23:36 -04:00
Nick Mathewson
2074fed664
Routerset config parsing: represent empty sets as NULL.
...
routerset_t has two representations of an empty routerset: NULL, and
a set containing no elements. But some of our config code assumes
that empty routersets are represented as NULL. So let's give it
what it assumes.
Fixes bug 31495. Bugfix on e16b90b88a76; but not in any released
Tor.
2019-08-28 11:53:28 -04:00
Nick Mathewson
04ab357df8
Remove extraneous "n" from comment in routerset.c
2019-08-28 11:39:31 -04:00
Nick Mathewson
b1d7ddfb02
Merge branch 'ticket31240v2' into ticket31240v2_merged_2
2019-08-28 09:46:59 -04:00
Nick Mathewson
38b770bbbb
Make a config_suite_t type to hold multiple config sub-objects
...
Right now, it doesn't do anything; this patch is meant to make sure
that we're doing memory management correctly.
2019-08-28 09:40:53 -04:00
Nick Mathewson
47654d3249
Refactor config free logic to use a single path.
...
The right way to free a config object is now to wrap config_free(),
always. Instead of creating an alternative free function, objects
should provide an alternative clear callback to free any fields that
the configuration manager doesn't manage.
This lets us simplify our code a little, and lets us extend the
confparse.c code to manage additional fields in config_free.
2019-08-28 09:40:53 -04:00
George Kadianakis
78e084a12e
Merge branch 'tor-github/pr/1267'
2019-08-27 11:47:46 +03:00
George Kadianakis
92a8573d22
Merge branch 'tor-github/pr/1258'
2019-08-27 11:45:18 +03:00
George Kadianakis
0d7f76d7ca
Merge branch 'tor-github/pr/1234'
2019-08-27 11:44:13 +03:00
Neel Chauhan
d9a7d47798
Check for private IPv6 addresses in dirserv_router_has_valid_address()
2019-08-26 18:21:56 -04:00
Neel Chauhan
14654d5c97
Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new()
2019-08-23 14:04:05 -04:00
teor
55580d063d
hs: Remove an outdated comment
2019-08-23 16:26:44 +10:00
teor
65935f6da7
Merge branch 'bug23818_035' into bug23818_master
2019-08-23 16:26:32 +10:00
teor
e2e1c07fd2
hs: v3 single onion services fall back to 3-hop intro for unreachable nodes
...
Previously, v3 single onion services failed when all intro nodes were
unreachable via a 1-hop path. Now, we select intros that are only available
via a 3-hop path, and use a 3-hop path to connect to them.
Fixes bug 23507; bugfix on 0.3.2.1-alpha.
2019-08-23 16:22:49 +10:00
teor
229a982405
hs: Always use a 3-hop path when a v3 single onion intro fails
...
Previously, we always used a 1-hop path, no matter how many times a v3
single onion intro failed.
Fixes bug 23818; bugfix on 0.3.2.1-alpha.
2019-08-23 15:09:55 +10:00
teor
c94904b359
hs: Always use a 3-hop path when a v3 single onion rend fails
...
Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.
Fixes bug 23818; bugfix on 0.3.2.1-alpha.
2019-08-23 15:09:43 +10:00
teor
14b5f40b54
Merge branch 'bug23818_029' into bug23818_035
2019-08-23 15:09:19 +10:00
Nick Mathewson
2780cbb9cb
Merge branch 'ticket30935' into ticket30935_merged
2019-08-22 17:25:35 -04:00
teor
e8ba094c3e
nodelist: Clear buffers and detect more caller errors in describe.c
...
Part of 21003.
2019-08-22 23:51:32 +10:00
Nick Mathewson
edf5a327c5
Merge branch 'ticket30914' into ticket30914_merged
2019-08-20 13:57:05 -04:00
Nick Mathewson
deccd3aa6a
Merge remote-tracking branch 'tor-github/pr/1225'
2019-08-19 11:08:44 -04:00
George Kadianakis
4185ef29fd
Merge branch 'tor-github/pr/1122'
2019-08-19 18:06:05 +03:00
teor
23844bc739
nodelist: Add support for multiple addresses in describe.c
...
Also prepare for unit tests.
Part of 21003.
2019-08-19 16:41:35 +10:00
teor
03be44e216
nodelist: Remove support for is_named in describe.c
...
The Named flag is deprecated. Removing support from the formatting code
simplifies the unit tests.
Part of 21003.
2019-08-19 16:40:42 +10:00
teor
81256c079f
nodelist: Move router_get_verbose_nickname() declaration
...
The declaration was in nodelist/routerinfo.h, but the implementation
was in nodelist/describe.h.
Part of 21003.
2019-08-19 16:40:41 +10:00
Roger Dingledine
9b1aa9a572
fix typo in keypin journal log entry (for dir auths)
2019-08-15 02:32:00 -04:00
teor
31fb2bceb5
Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
2019-08-12 09:53:59 +10:00
teor
224825e7ee
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
2019-08-12 09:51:00 +10:00
teor
e5be039494
Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5
2019-08-12 09:50:42 +10:00
teor
f65f4b5c38
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5
2019-08-12 09:49:53 +10:00
