bump to 0.2.1.6-alpha, and note that the exclude*nodes config

discussion hasn't finished.

svn:r17011

diff --git a/ChangeLog b/ChangeLog
index e60f7f70dcf4d2ecd5bba76cbb458ce54c9f68fa..b48463dbf11331b168cd725c5a22ce0462ddd21c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.1.6-alpha - 2008-09-29
+Changes in version 0.2.1.6-alpha - 2008-09-30
   o Major features:
     - Implement proposal 121: make it possible to build hidden services
       that only certain clients are allowed to connect to. This is
@@ -11,9 +11,11 @@ Changes in version 0.2.1.6-alpha - 2008-09-29
       i.e., the new default value for HidServDirectoryV2 is 1. This is
       the last step in proposal 114, which aims to make hidden service
       lookups more reliable.
-    - Allow node restrictions to include country codes. The syntax to
-      exclude nodes in a country with country code XX is "ExcludeNodes
-      {XX}". Patch from Robert Hogan.
+    - Start work to allow node restrictions to include country codes. The
+      syntax to exclude nodes in a country with country code XX is
+      "ExcludeNodes {XX}". Patch from Robert Hogan. It still needs some
+      refinement to decide what config options should take priority if
+      you ask to both use a particular node and exclude it.
     - Allow ExitNodes list to include IP ranges and country codes, just
       like the Exclude*Nodes lists. Patch from Robert Hogan.
 

diff --git a/configure.in b/configure.in
index 134b7abd4ff64b2c164190ec1e4645a930be1aba..222071880ac2292c340e89c7b24166786aed9687 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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.5-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.1.6-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST

diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 807d22220999592d222b895826a4fc6beb7c57ba..f196d5e14943826d45ab39e999a6172a44e58ebd 100644 (file)
--- 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.1.5-alpha-dev"
+!define VERSION "0.2.1.6-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e2075d636b5ab8a2c0c1f4368f165bcd2ef7a900..8a263bf4a4ab926dedc32fa8597699de29fd7c1e 100644 (file)
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,6 +227,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.1.5-alpha-dev"
+#define VERSION "0.2.1.6-alpha"