Commit 9f61d8a3 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.1' into release-0.2.1

parents 9ac4ceb0 a166f104

changes/bug3208

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Removed options:

    - Remove undocumented option "-F" from tor-resolve: it hasn't done

      anything since 0.2.1.16-rc.

changes/bug3208b

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

    - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.

      Fixes bug 3208.

src/or/circuitbuild.c

+0 −3
Original line number Diff line number Diff line
@@ -2297,7 +2297,6 @@ entry_guards_compute_status(void) 
{

  time_t now;

  int changed = 0;

  int severity = LOG_DEBUG;

  or_options_t *options;

  digestmap_t *reasons;

  if (! entry_guards)
@@ -2325,8 +2324,6 @@ entry_guards_compute_status(void) 
  if (remove_dead_entry_guards())

    changed = 1;



  severity = changed ? LOG_DEBUG : LOG_INFO;



  if (changed) {

    SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) {

      const char *reason = digestmap_get(reasons, entry->identity);

src/or/command.c

+1 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) 


  /* XXX maybe act on my_apparent_addr, if the source is sufficiently

   * trustworthy. */

  (void)my_apparent_addr;



  if (connection_or_set_state_open(conn)<0)

    connection_mark_for_close(TO_CONN(conn));

src/or/control.c

+0 −2
Original line number Diff line number Diff line
@@ -2999,7 +2999,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, 
{

  const char *status;

  char extended_buf[96];

  int providing_reason=0;

  if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS))

    return 0;

  tor_assert(circ);
@@ -3023,7 +3022,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, 
    const char *reason_str = circuit_end_reason_to_control_string(reason_code);

    char *reason = NULL;

    size_t n=strlen(extended_buf);

    providing_reason=1;

    if (!reason_str) {

      reason = tor_malloc(16);

      tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code);