[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r12516: cleanups, bump to 0.2.0.12-alpha (in tor/trunk: . contrib doc src/or src/win32)
Author: arma
Date: 2007-11-16 21:22:56 -0500 (Fri, 16 Nov 2007)
New Revision: 12516
Modified:
tor/trunk/ChangeLog
tor/trunk/configure.in
tor/trunk/contrib/tor-mingw.nsi.in
tor/trunk/doc/TODO
tor/trunk/src/or/config.c
tor/trunk/src/win32/orconfig.h
Log:
cleanups, bump to 0.2.0.12-alpha
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2007-11-17 01:53:33 UTC (rev 12515)
+++ tor/trunk/ChangeLog 2007-11-17 02:22:56 UTC (rev 12516)
@@ -1,15 +1,16 @@
-Changes in version 0.2.0.12-alpha - 2007-11-??
+Changes in version 0.2.0.12-alpha - 2007-11-16
o Compile fixes:
- Make it build on OpenBSD again. Patch from tup.
- - Substitute BINDIR and LOCALSTATEDIR in scripts. Fixes packaging.
+ - Substitute BINDIR and LOCALSTATEDIR in scripts. Fixes
+ package-building for Red Hat, OS X, etc.
o Minor bugfixes:
- When we're lacking a consensus, don't try to perform rendezvous
- operations. (Bug spotted by Karsten)
+ operations. Reported by Karsten Loesing.
- Fix a small memory leak whenever we decide against using a
newly picked entry guard. Reported by Mike Perry.
- Changing the ExitPolicyRejectPrivate setting should cause us to
- rebuild the descriptor.
+ rebuild our server descriptor.
- When authorities detected more than two relays running on the same
IP address, they were clearing all the status flags but forgetting
to clear the "hsdir" flag. So clients were being told that a
@@ -25,9 +26,10 @@
then be flexible about families.
o Minor features:
- - When we negotiate a v2 OR connection (not yet implemented), accept
- RELAY_EARLY cells and turn them into RELAY cells if we've negotiated
- a v1 connection. Initial code for proposal 110.
+ - When we negotiate a v2 link-layer connection (not yet implemented),
+ accept RELAY_EARLY cells and turn them into RELAY cells if we've
+ negotiated a v1 connection for their next step. Initial code for
+ proposal 110.
Changes in version 0.2.0.11-alpha - 2007-11-12
Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in 2007-11-17 01:53:33 UTC (rev 12515)
+++ tor/trunk/configure.in 2007-11-17 02:22:56 UTC (rev 12516)
@@ -4,7 +4,7 @@
dnl See LICENSE for licensing information
AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.0.11-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.0.12-alpha)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST
Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in 2007-11-17 01:53:33 UTC (rev 12515)
+++ tor/trunk/contrib/tor-mingw.nsi.in 2007-11-17 02:22:56 UTC (rev 12516)
@@ -5,7 +5,7 @@
;
!include "MUI.nsh"
-!define VERSION "0.2.0.11-alpha-dev"
+!define VERSION "0.2.0.12-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/";
Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO 2007-11-17 01:53:33 UTC (rev 12515)
+++ tor/trunk/doc/TODO 2007-11-17 02:22:56 UTC (rev 12516)
@@ -14,12 +14,10 @@
D Deferred
X Abandoned
-Items blocking 0.2.0.11-alpha:
- - bug 548.
-
-For Tor 0.2.0.12-alpha:
+For Tor 0.2.0.13-alpha:
- Put a consensus in place of the empty fallback-consensus file in
src/config and see what breaks.
+ - let bridges set relaybandwidthrate as low as 5kb
Things we'd like to do in 0.2.0.x:
- See also Flyspray tasks.
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2007-11-17 01:53:33 UTC (rev 12515)
+++ tor/trunk/src/or/config.c 2007-11-17 02:22:56 UTC (rev 12516)
@@ -2888,9 +2888,6 @@
*msg = tor_strdup(r >= 0 ? buf : "internal error");
return -1;
}
- if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
- REJECT("RelayBandwidthBurst must be at least equal "
- "to RelayBandwidthRate.");
if (options->RelayBandwidthRate &&
options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
r = tor_snprintf(buf, sizeof(buf),
@@ -2903,6 +2900,10 @@
}
}
+ if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
+ REJECT("RelayBandwidthBurst must be at least equal "
+ "to RelayBandwidthRate.");
+
if (options->BandwidthRate > options->BandwidthBurst)
REJECT("BandwidthBurst must be at least equal to BandwidthRate.");
@@ -3189,7 +3190,8 @@
!opt_streq(old_options->Nickname,new_options->Nickname) ||
!opt_streq(old_options->Address,new_options->Address) ||
!config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) ||
- old_options->ExitPolicyRejectPrivate != new_options->ExitPolicyRejectPrivate ||
+ old_options->ExitPolicyRejectPrivate !=
+ new_options->ExitPolicyRejectPrivate ||
old_options->ORPort != new_options->ORPort ||
old_options->DirPort != new_options->DirPort ||
old_options->ClientOnly != new_options->ClientOnly ||
Modified: tor/trunk/src/win32/orconfig.h
===================================================================
--- tor/trunk/src/win32/orconfig.h 2007-11-17 01:53:33 UTC (rev 12515)
+++ tor/trunk/src/win32/orconfig.h 2007-11-17 02:22:56 UTC (rev 12516)
@@ -227,6 +227,6 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.0.11-alpha-dev"
+#define VERSION "0.2.0.12-alpha"