nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson 2018-04-11 15:38:00 -04:00
commit a51630cc9a
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug25581 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (configuration):
- Remove undescores from the _HSLayer{2,3}Nodes options. This expert-user
configuration can now be enabled as HSLayer{2,3}Nodes. Fixes bug 25581;
bugfix on 0.3.3.1-alpha

20
doc/tor.1.txt
View File

@ -1533,7 +1533,7 @@ The following options are useful only for clients (that is, if
If no nodes in Tor2webRendezvousPoints are currently available for If no nodes in Tor2webRendezvousPoints are currently available for
use, Tor will choose a random node when building HS circuits. use, Tor will choose a random node when building HS circuits.
[[_HSLayer2Nodes]] **_HSLayer2Nodes** __node__,__node__,__...__:: [[HSLayer2Nodes]] **HSLayer2Nodes** __node__,__node__,__...__::
A list of identity fingerprints, nicknames, country codes, and A list of identity fingerprints, nicknames, country codes, and
address patterns of nodes that are allowed to be used as the address patterns of nodes that are allowed to be used as the
second hop in all client or service-side Onion Service circuits. second hop in all client or service-side Onion Service circuits.
@ -1543,7 +1543,7 @@ The following options are useful only for clients (that is, if
(Default: Any node in the network may be used in the second hop.) (Default: Any node in the network may be used in the second hop.)
+ +
(Example: (Example:
_HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
+ +
When this is set, the resulting hidden service paths will When this is set, the resulting hidden service paths will
look like: look like:
@ -1560,7 +1560,7 @@ The following options are useful only for clients (that is, if
Rend, HSDir, and Intro point selection is not affected by this Rend, HSDir, and Intro point selection is not affected by this
option. option.
+ +
This option may be combined with _HSLayer3Nodes to create This option may be combined with HSLayer3Nodes to create
paths of the form: paths of the form:
+ +
C - G - L2 - L3 - Rend + C - G - L2 - L3 - Rend +
@ -1570,7 +1570,7 @@ The following options are useful only for clients (that is, if
S - G - L2 - L3 - HSDir + S - G - L2 - L3 - HSDir +
S - G - L2 - L3 - Intro + S - G - L2 - L3 - Intro +
+ +
ExcludeNodes have higher priority than _HSLayer2Nodes, ExcludeNodes have higher priority than HSLayer2Nodes,
which means that nodes specified in ExcludeNodes will not be which means that nodes specified in ExcludeNodes will not be
picked. picked.
+ +
@ -1578,10 +1578,10 @@ The following options are useful only for clients (that is, if
https://github.com/mikeperry-tor/vanguards that selects and https://github.com/mikeperry-tor/vanguards that selects and
updates this set of nodes for you. Hence it does not do load updates this set of nodes for you. Hence it does not do load
balancing if fewer than 20 nodes are selected, and if no nodes in balancing if fewer than 20 nodes are selected, and if no nodes in
_HSLayer2Nodes are currently available for use, Tor will not work. HSLayer2Nodes are currently available for use, Tor will not work.
Please use extreme care if you are setting this option manually. Please use extreme care if you are setting this option manually.
[[_HSLayer3Nodes]] **_HSLayer3Nodes** __node__,__node__,__...__:: [[HSLayer3Nodes]] **HSLayer3Nodes** __node__,__node__,__...__::
A list of identity fingerprints, nicknames, country codes, and A list of identity fingerprints, nicknames, country codes, and
address patterns of nodes that are allowed to be used as the address patterns of nodes that are allowed to be used as the
third hop in all client and service-side Onion Service circuits. third hop in all client and service-side Onion Service circuits.
@ -1591,7 +1591,7 @@ The following options are useful only for clients (that is, if
(Default: Any node in the network may be used in the third hop.) (Default: Any node in the network may be used in the third hop.)
+ +
(Example: (Example:
_HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
+ +
When this is set by itself, the resulting hidden service paths When this is set by itself, the resulting hidden service paths
will look like: + will look like: +
@ -1607,7 +1607,7 @@ The following options are useful only for clients (that is, if
option. option.
+ +
While it is possible to use this option by itself, it should be While it is possible to use this option by itself, it should be
combined with _HSLayer2Nodes to create paths of the form: combined with HSLayer2Nodes to create paths of the form:
+ +
C - G - L2 - L3 - Rend + C - G - L2 - L3 - Rend +
C - G - L2 - L3 - M - HSDir + C - G - L2 - L3 - M - HSDir +
@ -1616,7 +1616,7 @@ The following options are useful only for clients (that is, if
S - G - L2 - L3 - HSDir + S - G - L2 - L3 - HSDir +
S - G - L2 - L3 - Intro + S - G - L2 - L3 - Intro +
+ +
ExcludeNodes have higher priority than _HSLayer3Nodes, ExcludeNodes have higher priority than HSLayer3Nodes,
which means that nodes specified in ExcludeNodes will not be which means that nodes specified in ExcludeNodes will not be
picked. picked.
+ +
@ -1624,7 +1624,7 @@ The following options are useful only for clients (that is, if
https://github.com/mikeperry-tor/vanguards that selects and https://github.com/mikeperry-tor/vanguards that selects and
updates this set of nodes for you. Hence it does not do load updates this set of nodes for you. Hence it does not do load
balancing if fewer than 20 nodes are selected, and if no nodes in balancing if fewer than 20 nodes are selected, and if no nodes in
_HSLayer3Nodes are currently available for use, Tor will not work. HSLayer3Nodes are currently available for use, Tor will not work.
Please use extreme care if you are setting this option manually. Please use extreme care if you are setting this option manually.
[[UseMicrodescriptors]] **UseMicrodescriptors** **0**|**1**|**auto**:: [[UseMicrodescriptors]] **UseMicrodescriptors** **0**|**1**|**auto**::

7
src/or/config.c
View File

@ -172,6 +172,9 @@ static config_abbrev_t option_abbrevs_[] = {
{ "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
{ "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0}, { "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0},
{ "SocksSocketsGroupWritable", "UnixSocksGroupWritable", 0, 1}, { "SocksSocketsGroupWritable", "UnixSocksGroupWritable", 0, 1},
{ "_HSLayer2Nodes", "HSLayer2Nodes", 0, 1 },
{ "_HSLayer3Nodes", "HSLayer3Nodes", 0, 1 },
{ NULL, NULL, 0, 0}, { NULL, NULL, 0, 0},
}; };
@ -419,8 +422,8 @@ static config_var_t option_vars_[] = {
V(Socks5ProxyPassword, STRING, NULL), V(Socks5ProxyPassword, STRING, NULL),
VAR("KeyDirectory", FILENAME, KeyDirectory_option, NULL), VAR("KeyDirectory", FILENAME, KeyDirectory_option, NULL),
V(KeyDirectoryGroupReadable, BOOL, "0"), V(KeyDirectoryGroupReadable, BOOL, "0"),
VAR("_HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL), VAR("HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL),
VAR("_HSLayer3Nodes", ROUTERSET, HSLayer3Nodes, NULL), VAR("HSLayer3Nodes", ROUTERSET, HSLayer3Nodes, NULL),
V(KeepalivePeriod, INTERVAL, "5 minutes"), V(KeepalivePeriod, INTERVAL, "5 minutes"),
V(KeepBindCapabilities, AUTOBOOL, "auto"), V(KeepBindCapabilities, AUTOBOOL, "auto"),
VAR("Log", LINELIST, Logs, NULL), VAR("Log", LINELIST, Logs, NULL),