diff options
| -rw-r--r-- | changes/bug7059a | 5 | ||||
| -rw-r--r-- | changes/dist-geoip6 | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/config/include.am | 4 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 5 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
7 files changed, 17 insertions, 6 deletions
diff --git a/changes/bug7059a b/changes/bug7059a new file mode 100644 index 0000000000..b0c0611705 --- /dev/null +++ b/changes/bug7059a @@ -0,0 +1,5 @@ + o Minor features (controller): + - Allow an optional $ before the node identity digest in the + controller command GETINFO ns/id/<identity>, for consistency with + md/id/<identity> and desc/id/<identity>. + diff --git a/changes/dist-geoip6 b/changes/dist-geoip6 new file mode 100644 index 0000000000..2f2bf8f99f --- /dev/null +++ b/changes/dist-geoip6 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Distribute and install the geoip6 IPv6 GeoIP database. Bugfix + on 0.2.4.6-alpha. diff --git a/configure.ac b/configure.ac index 2a2b8a48fe..9963a97d49 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.6-alpha]) +AC_INIT([tor],[0.2.4.6-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index ae79fe3375..c22d0c5dcd 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.6-alpha" +!define VERSION "0.2.4.6-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/config/include.am b/src/config/include.am index e6e1fe0440..35961b829a 100644 --- a/src/config/include.am +++ b/src/config/include.am @@ -2,12 +2,12 @@ confdir = $(sysconfdir)/tor tordatadir = $(datadir)/tor -EXTRA_DIST+= src/config/geoip +EXTRA_DIST+= src/config/geoip src/config/geoip6 # fallback-consensus conf_DATA = src/config/torrc.sample -tordata_DATA = src/config/geoip +tordata_DATA = src/config/geoip src/config/geoip6 # fallback_consensus # If we don't have it, fake it. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index f0efe80c71..f33de4c188 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2374,8 +2374,11 @@ getinfo_helper_networkstatus(control_connection_t *conn, return 0; } else if (!strcmpstart(question, "ns/id/")) { char d[DIGEST_LEN]; + const char *q = question + 6; + if (*q == '$') + ++q; - if (base16_decode(d, DIGEST_LEN, question+6, strlen(question+6))) { + if (base16_decode(d, DIGEST_LEN, q, strlen(q))) { *errmsg = "Data not decodeable as hex"; return -1; } diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a08cde268d..8fe31a02f9 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.6-alpha" +#define VERSION "0.2.4.6-alpha-dev" |