Commit f39cee37 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Merge branch 'debian-merge' into debian 

* debian-merge:
  New upstream version
  bump to 0.2.1.18
  put in the full 0.2.1 release notes
  add a changelog entry for the upcoming 0.2.1.18
  make phobos's lines start with tabs again
  added LIBS=-lrt to Makefile.am for static libevent in the tor rpms.
  forward-port the 0.2.0.35 release notes
  add blurbs for recent release candidates
  Bump version to 0.2.1.17-rc-dev
parents 95a66236 805b19e4

ChangeLog

+23 −0
Original line number Diff line number Diff line 
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.





Changes in version 0.2.1.17-rc - 2009-07-07

  Tor 0.2.1.17-rc marks the fourth -- and hopefully last -- release

  candidate for the 0.2.1.x series. It lays the groundwork for further

  client performance improvements, and also fixes a big bug with directory

  authorities that were causing them to assign Guard and Stable flags

  poorly.



  The Windows bundles also finally include the geoip database that we

  thought we'd been shipping since 0.2.0.x (oops), and the OS X bundles

  should actually install Torbutton rather than giving you a cryptic

  failure message (oops).



  o Major features:

    - Clients now use the bandwidth values in the consensus, rather than

      the bandwidth values in each relay descriptor. This approach opens
@@ -46,6 +62,9 @@ Changes in version 0.2.1.17-rc - 2009-07-07 




Changes in version 0.2.1.16-rc - 2009-06-20

  Tor 0.2.1.16-rc speeds up performance for fast exit relays, and fixes

  a bunch of minor bugs.



  o Security fixes:

    - Fix an edge case where a malicious exit relay could convince a

      controller that the client's DNS question resolves to an internal IP
@@ -92,6 +111,10 @@ Changes in version 0.2.1.16-rc - 2009-06-20 




Changes in version 0.2.1.15-rc - 2009-05-25

  Tor 0.2.1.15-rc marks the second release candidate for the 0.2.1.x

  series. It fixes a major bug on fast exit relays, as well as a variety

  of more minor bugs.



  o Major bugfixes (on 0.2.0.x):

    - Fix a timing-dependent, allocator-dependent, DNS-related crash bug

      that would occur on some exit nodes when DNS failures and timeouts

Makefile.am

+8 −9
Original line number Diff line number Diff line
@@ -30,12 +30,11 @@ dist-rpm: 
	pushd $$RPM_BUILD_DIR/SOURCES/;                         \

	tar zcf tor-$(VERSION).tar.gz ./;                       \

	popd;                                                   \

        rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \

	LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \

	mv $$RPM_BUILD_DIR/SRPMS/* .;                           \

	mv $$RPM_BUILD_DIR/RPMS/* .;                            \

	rm -rf $$RPM_BUILD_DIR





dist-osx:

	@if [ "x$(prefix)" != 'x/Library/Tor' ]; then \

	  echo "Configure with --prefix=/Library/Tor, please"; \

ReleaseNotes

+599 −0

File changed.

Preview size limit exceeded, changes collapsed.

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.17-rc)

AM_INIT_AUTOMAKE(tor, 0.2.1.18)

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.17-rc"

!define VERSION "0.2.1.18"

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

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

!define LICENSE "LICENSE"