diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/include.am | 4 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 5 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/config/include.am b/src/config/include.am index e6e1fe044..35961b829 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 f0efe80c7..f33de4c18 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 a08cde268..8fe31a02f 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" |