Merge remote-tracking branch 'asn-github/adaptive_padding-final'

    The .exit address notation, if enabled via MapAddress, overrides

    this option.

[[MiddleNodes]] **MiddleNodes** __node__,__node__,__...__::

    A list of identity fingerprints and country codes of nodes

    to use for "middle" hops in your normal circuits.

    Normal circuits include all circuits except for direct connections

    to directory servers. Middle hops are all hops other than exit and entry. +

+

    This is an **experimental** feature that is meant to be used by researchers

    and developers to test new features in the Tor network safely. Using it

    without care will strongly influence your anonymity. This feature might get

    removed in the future.

+

    The HSLayer2Node and HSLayer3Node options override this option for onion

    service circuits, if they are set. The vanguards addon will read this

    option, and if set, it will set HSLayer2Nodes and HSLayer3Nodes to nodes

    from this set.

+

    The ExcludeNodes option overrides this option: any node listed in both

    MiddleNodes and ExcludeNodes is treated as excluded. See

    the **ExcludeNodes** option for more information on how to specify nodes.

[[EntryNodes]] **EntryNodes** __node__,__node__,__...__::

    A list of identity fingerprints and country codes of nodes

    to use for the first hop in your normal circuits.

    If StrictNodes is set to 1, Tor will treat solely the ExcludeNodes option

    as a requirement to follow for all the circuits you generate, even if

    doing so will break functionality for you (StrictNodes applies to neither

    ExcludeExitNodes nor to ExitNodes).  If StrictNodes is set to 0, Tor will

    still try to avoid nodes in the ExcludeNodes list, but it will err on the

    side of avoiding unexpected errors.  Specifically, StrictNodes 0 tells Tor

    that it is okay to use an excluded node when it is *necessary* to perform

    relay reachability self-tests, connect to a hidden service, provide a

    hidden service to a client, fulfill a .exit request, upload directory

    information, or download directory information.  (Default: 0)

    ExcludeExitNodes nor to ExitNodes, nor to MiddleNodes).  If StrictNodes

    is set to 0, Tor will still try to avoid nodes in the ExcludeNodes list,

    but it will err on the side of avoiding unexpected errors.

    Specifically, StrictNodes 0 tells Tor that it is okay to use an excluded

    node when it is *necessary* to perform relay reachability self-tests,

    connect to a hidden service, provide a hidden service to a client,

    fulfill a .exit request, upload directory information, or download

    directory information.  (Default: 0)

[[FascistFirewall]] **FascistFirewall** **0**|**1**::

    If 1, Tor will only create outgoing connections to ORs running on ports

  V(ExcludeExitNodes,            ROUTERSET, NULL),

  OBSOLETE("ExcludeSingleHopRelays"),

  V(ExitNodes,                   ROUTERSET, NULL),

  /* Researchers need a way to tell their clients to use specific

   * middles that they also control, to allow safe live-network

   * experimentation with new padding machines. */

  V(MiddleNodes,                 ROUTERSET, NULL),

  V(ExitPolicy,                  LINELIST, NULL),

  V(ExitPolicyRejectPrivate,     BOOL,     "1"),

  V(ExitPolicyRejectLocalInterfaces, BOOL, "0"),

  int routerset_usage =

    routerset_needs_geoip(options->EntryNodes) ||

    routerset_needs_geoip(options->ExitNodes) ||

    routerset_needs_geoip(options->MiddleNodes) ||

    routerset_needs_geoip(options->ExcludeExitNodes) ||

    routerset_needs_geoip(options->ExcludeNodes) ||

    routerset_needs_geoip(options->HSLayer2Nodes) ||

                         options->HSLayer2Nodes) ||

        !routerset_equal(old_options->HSLayer3Nodes,

                         options->HSLayer3Nodes) ||

        !routerset_equal(old_options->MiddleNodes, options->MiddleNodes) ||

        options->StrictNodes != old_options->StrictNodes) {

      log_info(LD_CIRC,

               "Changed to using entry guards or bridges, or changed "

  routerset_t *ExitNodes; /**< Structure containing nicknames, digests,

                           * country codes and IP address patterns of ORs to

                           * consider as exits. */

  routerset_t *MiddleNodes; /**< Structure containing nicknames, digests,

                             * country codes and IP address patterns of ORs to

                             * consider as middles. */

  routerset_t *EntryNodes;/**< Structure containing nicknames, digests,

                           * country codes and IP address patterns of ORs to

                           * consider as entry points. */

#include "core/mainloop/netstatus.h"

#include "core/or/channel.h"

#include "core/or/channelpadding.h"

#include "core/or/circuitpadding.h"

#include "core/or/channeltls.h"

#include "core/or/circuitlist.h"

#include "core/or/circuitmux_ewma.h"

  /* The options are now initialised */

  const or_options_t *options = get_options();

  /* Initialize channelpadding parameters to defaults until we get

   * a consensus */

  /* Initialize channelpadding and circpad parameters to defaults

   * until we get a consensus */

  channelpadding_new_consensus_params(NULL);

  circpad_new_consensus_params(NULL);

  /* Initialize circuit padding to defaults+torrc until we get a consensus */

  circpad_machines_init();

  /* Initialize predicted ports list after loading options */

  predicted_ports_init();

  dns_free_all();

  clear_pending_onions();

  circuit_free_all();

  circpad_machines_free();

  entry_guards_free_all();

  pt_free_all();

  channel_tls_free_all();

	src/core/or/circuitlist.c		\

	src/core/or/circuitmux.c		\

	src/core/or/circuitmux_ewma.c		\

	src/core/or/circuitpadding.c		\

	src/core/or/circuitstats.c		\

	src/core/or/circuituse.c		\

	src/core/or/command.c			\

	src/core/or/circuitmux.h			\

	src/core/or/circuitmux_ewma.h			\

	src/core/or/circuitstats.h			\

	src/core/or/circuitpadding.h			\

	src/core/or/circuituse.h			\

	src/core/or/command.h				\

	src/core/or/connection_edge.h			\