浏览代码

bump to 0.2.1.6-alpha, and note that the exclude*nodes config
discussion hasn't finished.


svn:r17011

Roger Dingledine 17 年之前
父节点
当前提交
a04baf14b6
共有 4 个文件被更改,包括 9 次插入7 次删除
  1. 6 4
      ChangeLog
  2. 1 1
      configure.in
  3. 1 1
      contrib/tor-mingw.nsi.in
  4. 1 1
      src/win32/orconfig.h

+ 6 - 4
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:
   o Major features:
     - Implement proposal 121: make it possible to build hidden services
     - Implement proposal 121: make it possible to build hidden services
       that only certain clients are allowed to connect to. This is
       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
       i.e., the new default value for HidServDirectoryV2 is 1. This is
       the last step in proposal 114, which aims to make hidden service
       the last step in proposal 114, which aims to make hidden service
       lookups more reliable.
       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
     - Allow ExitNodes list to include IP ranges and country codes, just
       like the Exclude*Nodes lists. Patch from Robert Hogan.
       like the Exclude*Nodes lists. Patch from Robert Hogan.
 
 

+ 1 - 1
configure.in

@@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 dnl See LICENSE for licensing information
 
 
 AC_INIT
 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)
 AM_CONFIG_HEADER(orconfig.h)
 
 
 AC_CANONICAL_HOST
 AC_CANONICAL_HOST

+ 1 - 1
contrib/tor-mingw.nsi.in

@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
 !insertmacro GetParameters
   
   
-!define VERSION "0.2.1.5-alpha-dev"
+!define VERSION "0.2.1.6-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
 !define LICENSE "LICENSE"

+ 1 - 1
src/win32/orconfig.h

@@ -227,6 +227,6 @@
 #define USING_TWOS_COMPLEMENT
 #define USING_TWOS_COMPLEMENT
 
 
 /* Version number of package */
 /* Version number of package */
-#define VERSION "0.2.1.5-alpha-dev"
+#define VERSION "0.2.1.6-alpha"