Commit 586c3a7c authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.5'

parents a6a7a1f3 9daf06d1

doc/tor.1.txt

+1 −3
Original line number Diff line number Diff line
@@ -635,9 +635,7 @@ GENERAL OPTIONS 


[[KeepalivePeriod]] **KeepalivePeriod** __NUM__::

    To keep firewalls from expiring connections, send a padding keepalive cell

    every NUM seconds on open connections that are in use. If the connection

    has no open circuits, it will instead be closed after NUM seconds of

    idleness. (Default: 5 minutes)

    every NUM seconds on open connections that are in use. (Default: 5 minutes)



[[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**::

    Send all messages between __minSeverity__ and __maxSeverity__ to the standard

src/core/or/circuitbuild.c

+2 −3
Original line number Diff line number Diff line
@@ -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

 * 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.

 * If <b>verbose_names</b> is false, give nicknames for Named routers and hex

 * digests for others; if <b>verbose_names</b> is true, use $DIGEST=Name style

 * names.

 * If <b>verbose_names</b> is false, give hex digests; if <b>verbose_names</b>

 * is true, use $DIGEST=Name style names.

 */

static char *

circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names)

src/feature/nodelist/nodelist.c

+1 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,7 @@ nodes_in_same_family(const node_t *node1, const node_t *node2) 
      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) {

    SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, {

        if (routerset_contains_node(rs, node1) &&