Commit 5962431a authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Merge commit 'tor-0.2.1.19' into debian-merge 

* commit 'tor-0.2.1.19':
  bump to 0.2.1.19
  document my new relay-early behavior
  Changing MaxAdvertisedBW may not need a republish
  Write fingerprint to file and log without spaces
  Don't leak memory if we get too many create cells
  three hacks to workaround bug 1038
parents f39cee37 69706f99

ChangeLog

+21 −0
Original line number Diff line number Diff line 
Changes in version 0.2.1.19 - 2009-07-28

  o Major bugfixes:

    - Make accessing hidden services on 0.2.1.x work right

      again. Bugfix on 0.2.1.3-alpha; workaround for bug 1038.



  o Minor features:

    - When a relay/bridge is writing out its identity key fingerprint to

      the "fingerprint" file and to its logs, write it without spaces. Now

      it will look like the fingerprints in our bridges documentation,

      and confuse fewer users.



  o Minor bugfixes:

    - Relays no longer publish a new server descriptor if they change

      their MaxAdvertisedBandwidth config option but it doesn't end up

      changing their advertised bandwidth numbers. Bugfix on 0.2.0.28-rc;

      fixes bug 1026. Patch from Sebastian.

    - Avoid leaking memory every time we get a create cell but we have

      so many already queued that we refuse it. Bugfix on 0.2.0.19-alpha;

      fixes bug 1034. Reported by BarkerJr.





Changes in version 0.2.1.18 - 2009-07-24

  o Build fixes:

    - Add LIBS=-lrt to Makefile.am so the Tor RPMs use a static libevent.

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. 
dnl See LICENSE for licensing information



AC_INIT

AM_INIT_AUTOMAKE(tor, 0.2.1.18)

AM_INIT_AUTOMAKE(tor, 0.2.1.19)

AM_CONFIG_HEADER(orconfig.h)



AC_CANONICAL_HOST

contrib/tor-mingw.nsi.in

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
!include "FileFunc.nsh"

!insertmacro GetParameters

  

!define VERSION "0.2.1.18"

!define VERSION "0.2.1.19"

!define INSTALLER "tor-${VERSION}-win32.exe"

!define WEBSITE "https://www.torproject.org/"

!define LICENSE "LICENSE"

doc/spec/tor-spec.txt

+5 −2
Original line number Diff line number Diff line
@@ -661,8 +661,11 @@ see tor-design.pdf. 
   is speaking v2 of the link protocol or later, the OR relays the cell as a

   RELAY_EARLY cell.  Otherwise, it relays it as a RELAY cell.



   If a node ever receives more than 8 RELAY_EARLY cells on a given circuit,

   it SHOULD close the circuit.

   If a node ever receives more than 8 RELAY_EARLY cells on a given

   outbound circuit, it SHOULD close the circuit. (For historical reasons,

   we don't limit the number of inbound RELAY_EARLY cells; they should

   be harmless anyway because clients won't accept extend requests. See

   bug 1038.)



   When speaking v2 of the link protocol or later, clients MUST only send

   EXTEND cells inside RELAY_EARLY cells.  Clients SHOULD send the first ~8

src/or/command.c

+2 −6
Original line number Diff line number Diff line
@@ -395,12 +395,8 @@ command_process_relay_cell(cell_t *cell, or_connection_t *conn) 
   * gotten no more than MAX_RELAY_EARLY_CELLS_PER_CIRCUIT of them. */

  if (cell->command == CELL_RELAY_EARLY) {

    if (direction == CELL_DIRECTION_IN) {

      log_fn(LOG_PROTOCOL_WARN, LD_OR,

             "Received an inbound RELAY_EARLY cell on circuit %d from %s:%d."

             "  Closing circuit.",

             cell->circ_id, conn->_base.address, conn->_base.port);

      circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);

      return;

      /* XXX Allow an unlimited number of inbound relay_early cells for

       * now, for hidden service compatibility. See bug 1038. -RD */

    } else {

      or_circuit_t *or_circ = TO_OR_CIRCUIT(circ);

      if (or_circ->remaining_relay_early_cells == 0) {