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

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

* commit 'tor-0.2.2.5-alpha':
  fix compile on windows
  bump to 0.2.2.5-alpha
  Move dizum to an alternate IP address.
  Ship test.h in release
parents 1b2b8ef8 9d6c79cb
Changes in version 0.2.2.5-alpha - 2009-10-11
o Major bugfixes:
- Make the tarball compile again. Oops. Bugfix on 0.2.2.4-alpha.
o New directory authorities:
- Move dizum to an alternate IP address.
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
......
......@@ -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.4-alpha)
AM_INIT_AUTOMAKE(tor, 0.2.2.5-alpha)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST
......
......@@ -9,7 +9,7 @@
!include "FileFunc.nsh"
!insertmacro GetParameters
!define VERSION "0.2.2.4-alpha"
!define VERSION "0.2.2.5-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
......
......@@ -14,6 +14,10 @@
#include "or.h"
#include "crypto.h"
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
#endif
/*
* This madness is needed because if we simply #undef log
* before including or.h or log.h, we get linker collisions
......
......@@ -921,7 +921,7 @@ add_default_trusted_dir_authorities(authority_type_t type)
"tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
"dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
"194.109.206.214:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
"Tonga orport=443 bridge no-v2 82.94.251.203:80 "
"4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
"ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
......
......@@ -28,4 +28,4 @@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
../common/libor-event.a \
-lz -lm -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
noinst_HEADERS = tinytest.h tinytest_macros.h
noinst_HEADERS = tinytest.h tinytest_macros.h test.h
......@@ -226,5 +226,5 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
#define VERSION "0.2.2.4-alpha"
#define VERSION "0.2.2.5-alpha"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment