Ticket #13447: git.diff

File git.diff, 1.0 KB (added by akwizgran, 5 years ago)
  • src/or/config.c

    diff --git a/src/or/config.c b/src/or/config.c
    index 921d032..6e5a131 100644
    a b options_act_reversible(const or_options_t *old_options, char **msg) 
    10701070                 "non-control network connections. Shutting down all existing "
    10711071                 "connections.");
    10721072      connection_mark_all_noncontrol_connections();
     1073      /* We can't complete circuits until the network is re-enabled. */
     1074      can_complete_circuit = 0;
    10731075    }
    10741076  }
    10751077
  • src/or/rendservice.c

    diff --git a/src/or/rendservice.c b/src/or/rendservice.c
    index 31b612b..5e3ef98 100644
    a b  
    1616#include "circuituse.h"
    1717#include "config.h"
    1818#include "directory.h"
     19#include "main.h"
    1920#include "networkstatus.h"
    2021#include "nodelist.h"
    2122#include "rendclient.h"
    rend_services_introduce(void) 
    30323033  time_t now;
    30333034  const or_options_t *options = get_options();
    30343035
     3036  if (!can_complete_circuit)
     3037    return;
     3038
    30353039  intro_nodes = smartlist_new();
    30363040  now = time(NULL);
    30373041