Unverified Commit 231036a1 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.3.4' into maint-0.3.5

parents 742b5b32 cbce8ded

changes/bug29017

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (stats):

    - When ExtraInfoStatistics is 0, stop including PaddingStatistics in

      relay and bridge extra-info documents. Fixes bug 29017;

      bugfix on 0.3.1.1-alpha.

changes/bug29665

0 → 100644
+7 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (single onion services):

    - Allow connections to single onion services to remain idle without

      being disconnected. Relays acting as rendezvous points for

      single onion services were mistakenly closing idle established

      rendezvous circuits after 60 seconds, thinking that they are unused

      directory-fetching circuits that had served their purpose. Fixes

      bug 29665; bugfix on 0.2.1.26.

doc/tor.1.txt

+1 −1
Original line number Diff line number Diff line
@@ -2279,7 +2279,7 @@ is non-zero): 
    extra-info document. (Default: 0)



[[PaddingStatistics]] **PaddingStatistics** **0**|**1**::

    Relays only.

    Relays and bridges only.

    When this option is enabled, Tor collects statistics for padding cells

    sent and received by this relay, in addition to total cell counts.

    These statistics are rounded, and omitted if traffic is low. This

src/core/or/circuituse.c

+4 −0
Original line number Diff line number Diff line
@@ -1570,10 +1570,14 @@ circuit_expire_old_circuits_serverside(time_t now) 
    or_circ = TO_OR_CIRCUIT(circ);

    /* If the circuit has been idle for too long, and there are no streams

     * on it, and it ends here, and it used a create_fast, mark it for close.

     *

     * Also if there is a rend_splice on it, it's a single onion service

     * circuit and we should not close it.

     */

    if (or_circ->p_chan && channel_is_client(or_circ->p_chan) &&

        !circ->n_chan &&

        !or_circ->n_streams && !or_circ->resolving_streams &&

        !or_circ->rend_splice &&

        channel_when_last_xmit(or_circ->p_chan) <= cutoff) {

      log_info(LD_CIRC, "Closing circ_id %u (empty %d secs ago)",

               (unsigned)or_circ->p_circ_id,

src/feature/relay/router.c

+5 −6
Original line number Diff line number Diff line
@@ -2936,13 +2936,12 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, 
                        "conn-bi-direct", now, &contents) > 0) {

      smartlist_add(chunks, contents);

    }

  }



    if (options->PaddingStatistics) {

      contents = rep_hist_get_padding_count_lines();

      if (contents)

        smartlist_add(chunks, contents);

    }

  }



  /* Add information about the pluggable transports we support. */

  if (options->ServerTransportPlugin) {