Merge branch 'debian-merge' into debian

* debian-merge:
  New upstream version
  fix compile on windows
  bump to 0.2.2.5-alpha
  Move dizum to an alternate IP address.
  Ship test.h in release

8 files changed, 23 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index fbb48f9df6..4d4745aae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/configure.in b/configure.in
index 39ca3085d8..62451e6705 100644
--- a/configure.in
+++ b/configure.in
@@ -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
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 28492eea30..4fe579abe4 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -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"
diff --git a/debian/changelog b/debian/changelog
index 16eb6d5bad..f319e54275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tor (0.2.2.5-alpha-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 15 Nov 2009 10:37:05 +0100
+
 tor (0.2.2.4-alpha-1) experimental; urgency=low
 
   * New upstream version.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index fbdbb85b2f..40c3a6b87f 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -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
diff --git a/src/or/config.c b/src/or/config.c
index df346081a8..84fe80350b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -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 "
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index bbf0f308a7..ea7c67eda7 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -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
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index b128862a25..fcd3be497c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.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"