nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5'

Browse Source
This commit is contained in:
Nick Mathewson 2018-11-14 07:42:56 -05:00
commit 586c3a7c90
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tor.1.txt
View File

@ -635,9 +635,7 @@ GENERAL OPTIONS
[[KeepalivePeriod]] **KeepalivePeriod** __NUM__:: [[KeepalivePeriod]] **KeepalivePeriod** __NUM__::
To keep firewalls from expiring connections, send a padding keepalive cell To keep firewalls from expiring connections, send a padding keepalive cell
every NUM seconds on open connections that are in use. If the connection every NUM seconds on open connections that are in use. (Default: 5 minutes)
has no open circuits, it will instead be closed after NUM seconds of
idleness. (Default: 5 minutes)
[[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**:: [[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**::
Send all messages between __minSeverity__ and __maxSeverity__ to the standard Send all messages between __minSeverity__ and __maxSeverity__ to the standard

5
src/core/or/circuitbuild.c
View File

@ -255,9 +255,8 @@ get_unique_circ_id_by_chan(channel_t *chan)
/** If <b>verbose</b> is false, allocate and return a comma-separated list of /** If <b>verbose</b> is false, allocate and return a comma-separated list of
* the currently built elements of <b>circ</b>. If <b>verbose</b> is true, also * the currently built elements of <b>circ</b>. If <b>verbose</b> is true, also
* list information about link status in a more verbose format using spaces. * list information about link status in a more verbose format using spaces.
* If <b>verbose_names</b> is false, give nicknames for Named routers and hex * If <b>verbose_names</b> is false, give hex digests; if <b>verbose_names</b>
* digests for others; if <b>verbose_names</b> is true, use $DIGEST=Name style * is true, use $DIGEST=Name style names.
* names.
*/ */
static char * static char *
circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names)

2
src/feature/nodelist/nodelist.c
View File

@ -1941,7 +1941,7 @@ nodes_in_same_family(const node_t *node1, const node_t *node2)
return 1; return 1;
} }
/* Are they in the same option because the user says they are? */ /* Are they in the same family because the user says they are? */
if (options->NodeFamilySets) { if (options->NodeFamilySets) {
SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, { SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, {
if (routerset_contains_node(rs, node1) && if (routerset_contains_node(rs, node1) &&