Commit 0b2822c7 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Merge commit 'tor-0.2.2.3-alpha' into debian-merge 

* commit 'tor-0.2.2.3-alpha':
  finishing touches on the changelog
  bump to 0.2.2.3-alpha, plus add a changelog for bug 1103
  Be more robust to bad circwindow values
  Fix Bug 1103.
  Bump version to 0.2.2.2-alpha-dev
parents 6332c51f 0f3417d1

ChangeLog

+11 −0
Original line number Diff line number Diff line 
Changes in version 0.2.2.3-alpha - 2009-09-23

  o Major bugfixes:

    - Fix an overzealous assert in our new circuit build timeout code.

      Bugfix on 0.2.2.2-alpha; fixes bug 1103.



  o Minor bugfixes:

    - If the networkstatus consensus tells us that we should use a

      negative circuit package window, ignore it. Otherwise we'll

      believe it and then trigger an assert. Bugfix on 0.2.2.2-alpha.





Changes in version 0.2.2.2-alpha - 2009-09-21

  o Major features:

    - Tor now tracks how long it takes to build client-side circuits

configure.in

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



AC_INIT

AM_INIT_AUTOMAKE(tor, 0.2.2.2-alpha)

AM_INIT_AUTOMAKE(tor, 0.2.2.3-alpha)

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.2.2-alpha"

!define VERSION "0.2.2.3-alpha"

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

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

!define LICENSE "LICENSE"

src/or/circuitbuild.c

+2 −0
Original line number Diff line number Diff line
@@ -643,6 +643,8 @@ circuit_build_times_count_pretimeouts(circuit_build_times_t *cbt) 
    double timeout_quantile = 1.0-

          ((double)cbt->pre_timeouts)/

                    (cbt->pre_timeouts+cbt->total_build_times);

    /* Make sure it doesn't exceed the synthetic max */

    timeout_quantile *= MAX_SYNTHETIC_QUANTILE;

    cbt->Xm = circuit_build_times_mode(cbt);

    tor_assert(cbt->Xm > 0);

    /* Use current timeout to get an estimate on alpha */

src/or/circuitlist.c

+5 −4
Original line number Diff line number Diff line
@@ -367,10 +367,11 @@ circuit_purpose_to_controller_string(uint8_t purpose) 
int32_t

circuit_initial_package_window(void)

{

  networkstatus_t *consensus = networkstatus_get_latest_consensus();

  if (consensus)

    return networkstatus_get_param(consensus, "circwindow", CIRCWINDOW_START);

  return CIRCWINDOW_START;

  int32_t num = networkstatus_get_param(NULL, "circwindow", CIRCWINDOW_START);

  /* If the consensus tells us a negative number, we'd assert. */

  if (num < 0)

    num = CIRCWINDOW_START;

  return num;

}



/** Initialize the common elements in a circuit_t, and add it to the global