Commit 01da8106 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

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

* commit 'tor-0.2.2.4-alpha': (49 commits)
  Fix testsuite call.
  bump to 0.2.2.4-alpha
  Don't set unreachable from dirvote unless we've been running a while.
  correct the spec for the stream_bw event.
  fix a bug where we were decrementing the wrong bucket
  remove some dead code. some of it was tickling coverity.
  add blurbs for recent alpha releases
  Fix a memleak when throwing away some build times
  amend changelog for recent commits, plus clean up
  Tweak an assert that shouldn't fire either way.
  Tweak values for when to discard all of our history.
  Remove another overzealous assert.
  try to stem the 'sea of fail'
  fix the wiki link in doc pages. remove obsolete FAQ.
  Ignore one-hop circuits for circuit timeout calc
  Move Tonga to an alternate IP address
  update spec to reflect change in Fast definition
  Move moria1 to a nearby IP address
  Dir auths reject relays running < Tor 0.1.2.14
  Fix 1108: Handle corrupt or large build times state.
  ...
parents c7d0711d 2f760c54

.gitignore

+7 −1
Original line number Diff line number Diff line
@@ -127,7 +127,13 @@ 
/src/or/or_sha1.i

/src/or/micro-revision.*

/src/or/tor

/src/or/test

/src/or/libtor.a



# /src/test

/src/test/Makefile

/src/test/Makefile.in

/src/test/test





# /src/tools/

/src/tools/tor-checkkey

ChangeLog

+55 −0
Original line number Diff line number Diff line 
Changes in version 0.2.2.4-alpha - 2009-10-10

  o Major bugfixes:

    - Fix several more asserts in the circuit_build_times code, for

      example one that causes Tor to fail to start once we have

      accumulated 5000 build times in the state file. Bugfixes on

      0.2.2.2-alpha; fixes bug 1108.



  o New directory authorities:

    - Move moria1 and Tonga to alternate IP addresses.



  o Minor features:

    - Log SSL state transitions at debug level during handshake, and

      include SSL states in error messages. This may help debug future

      SSL handshake issues.

    - Add a new "Handshake" log domain for activities that happen

      during the TLS handshake.

    - Revert to the "June 3 2009" ip-to-country file. The September one

      seems to have removed most US IP addresses.

    - Directory authorities now reject Tor relays with versions less than

      0.1.2.14. This step cuts out four relays from the current network,

      none of which are very big.



  o Minor bugfixes:

    - Fix a couple of smaller issues with gathering statistics. Bugfixes

      on 0.2.2.1-alpha.

    - Fix two memory leaks in the error case of

      circuit_build_times_parse_state. Bugfix on 0.2.2.2-alpha.

    - Don't count one-hop circuits when we're estimating how long it

      takes circuits to build on average. Otherwise we'll set our circuit

      build timeout lower than we should. Bugfix on 0.2.2.2-alpha.

    - Directory authorities no longer change their opinion of, or vote on,

      whether a router is Running, unless they have themselves been

      online long enough to have some idea. Bugfix on 0.2.0.6-alpha.

      Fixes bug 1023.



  o Code simplifications and refactoring:

    - Revise our unit tests to use the "tinytest" framework, so we

      can run tests in their own processes, have smarter setup/teardown

      code, and so on.  The unit test code has moved to its own

      subdirectory, and has been split into multiple modules.





Changes in version 0.2.2.3-alpha - 2009-09-23

  Tor 0.2.2.3-alpha fixes a few crash bugs in 0.2.2.2-alpha.



  o Major bugfixes:

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

      Bugfix on 0.2.2.2-alpha; fixes bug 1103.
@@ -10,6 +54,12 @@ Changes in version 0.2.2.3-alpha - 2009-09-23 




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

  Tor 0.2.2.2-alpha introduces our latest performance improvement for

  clients: Tor tracks the average time it takes to build a circuit, and

  avoids using circuits that take too long to build. For fast connections,

  this feature can cut your expected latency in half. For slow or flaky

  connections, it could ruin your Tor experience. Let us know if it does!



  o Major features:

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

      over time, and adapts its timeout to local network performance.
@@ -79,6 +129,11 @@ Changes in version 0.2.2.2-alpha - 2009-09-21 




Changes in version 0.2.2.1-alpha - 2009-08-26

  Tor 0.2.2.1-alpha disables ".exit" address notation by default, allows

  Tor clients to bootstrap on networks where only port 80 is reachable,

  makes it more straightforward to support hardware crypto accelerators,

  and starts the groundwork for gathering stats safely at relays.



  o Security fixes:

    - Start the process of disabling ".exit" address notation, since it

      can be used for a variety of esoteric application-level attacks

Makefile.am

+4 −3
Original line number Diff line number Diff line
@@ -58,15 +58,16 @@ dist: check 
doxygen:

	doxygen && cd doc/doxygen/latex && make



test:

	./src/or/test

test: all

	./src/test/test



# Avoid strlcpy.c, strlcat.c, tree.h

check-spaces:

	./contrib/checkSpace.pl -C                    \

	        src/common/*.h                        \

		src/common/[^asO]*.c src/common/address.c \

		src/or/[^et]*.[ch] src/or/t*.c src/or/eventdns_tor.h

		src/or/[^et]*.[ch] src/or/t*.c src/or/eventdns_tor.h \

		src/test/test*.[ch]



check-docs:

	./contrib/checkOptionDocs.pl

configure.in

+2 −2
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.3-alpha)

AM_INIT_AUTOMAKE(tor, 0.2.2.4-alpha)

AM_CONFIG_HEADER(orconfig.h)



AC_CANONICAL_HOST
@@ -826,7 +826,7 @@ fi 


CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"



AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])

AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])

AC_OUTPUT



if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

contrib/cross.sh

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ if [ ! -z $STRIP ] 
then

${HOST_TRIPLET}strip \

	src/or/tor \

	src/or/test \

	src/test/test \

	src/tools/tor-resolve

fi