[or-cvs] r17011: {tor} bump to 0.2.1.6-alpha, and note that the exclude*nodes confi (in tor/trunk: . contrib src/win32)

[arma at seul.org]

Author: arma
Date: 2008-09-30 05:37:18 -0400 (Tue, 30 Sep 2008)
New Revision: 17011

Modified:
   tor/trunk/ChangeLog
   tor/trunk/configure.in
   tor/trunk/contrib/tor-mingw.nsi.in
   tor/trunk/src/win32/orconfig.h
Log:
bump to 0.2.1.6-alpha, and note that the exclude*nodes config
discussion hasn't finished.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-09-30 09:32:26 UTC (rev 17010)
+++ tor/trunk/ChangeLog	2008-09-30 09:37:18 UTC (rev 17011)
@@ -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 @@
       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.
 

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2008-09-30 09:32:26 UTC (rev 17010)
+++ tor/trunk/configure.in	2008-09-30 09:37:18 UTC (rev 17011)
@@ -5,7 +5,7 @@
 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

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2008-09-30 09:32:26 UTC (rev 17010)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2008-09-30 09:37:18 UTC (rev 17011)
@@ -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"

Modified: tor/trunk/src/win32/orconfig.h
===================================================================
--- tor/trunk/src/win32/orconfig.h	2008-09-30 09:32:26 UTC (rev 17010)
+++ tor/trunk/src/win32/orconfig.h	2008-09-30 09:37:18 UTC (rev 17011)
@@ -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"