- tor-commits - lists.torproject.org

r24802: {website} fix a grammar mistake. (website/trunk/projects/en)
by Andrew Lewman 04 Jun '11

04 Jun '11

Author: phobos Date: 2011-06-04 11:40:40 +0000 (Sat, 04 Jun 2011) New Revision: 24802 Modified: website/trunk/projects/en/vidalia.wml Log: fix a grammar mistake. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-06-04 03:00:06 UTC (rev 24801) +++ website/trunk/projects/en/vidalia.wml 2011-06-04 11:40:40 UTC (rev 24802) @@ -80,7 +80,7 @@ <h4>Alpha Releases</h4> The most recent alpha release is: 0.3.0 - WARNING this are very alpha bundles. + WARNING these are very alpha bundles. <ul> <li> <a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">Windows Installer</a>

1 0

[torbutton/master] Bug 3345: Make Google Captcha redirect work again.
by mikeperry＠torproject.org 04 Jun '11

04 Jun '11

commit e42dc36ceb914766c3337a655b4998f07407ddfb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 3 20:00:19 2011 -0700 Bug 3345: Make Google Captcha redirect work again. --- src/chrome/content/torbutton.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 401443a..720e281 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3035,7 +3035,8 @@ function torbutton_check_google_captcha(subject, topic, data) { redirURI.init(Ci.nsIStandardURL.URLTYPE_STANDARD, 80, redir, subject.URI.originCharset, null); redirURI = redirURI.QueryInterface(Components.interfaces.nsIURI); - if (redirURI.host == "sorry.google.com") { + if (redirURI.host == "sorry.google.com" + || redirURI.path.match("^/sorry/")) { var browser = null; if(m_tb_ff3 && subject.notificationCallbacks) { // Arg. google.timers.load.t is fucking us up!

1 0

r24801: {} Write down my thoughts on a simplified product package roadm (projects/roadmaps)
by Andrew Lewman 04 Jun '11

04 Jun '11

Author: phobos Date: 2011-06-04 03:00:06 +0000 (Sat, 04 Jun 2011) New Revision: 24801 Added: projects/roadmaps/proposed-package-roadmap.txt Log: Write down my thoughts on a simplified product package roadmap. Added: projects/roadmaps/proposed-package-roadmap.txt =================================================================== --- projects/roadmaps/proposed-package-roadmap.txt (rev 0) +++ projects/roadmaps/proposed-package-roadmap.txt 2011-06-04 03:00:06 UTC (rev 24801) @@ -0,0 +1,132 @@ +Proposed Package Roadmap + +I've been thinking about how we can simplify our product list and get +back to focusing on what we're good at producing. At the same time, +getting more people involved in each others products can get us back +to the idea we had at the 2010 Potsdam meeting where we had primary and +secondary developers for each product. + +I propose we radically simplify our packages to the following four, for +all operating systems we support: + +1. tor-client. This is the tor browser bundle. +2. tor-relay. This is the tor binary with geoipdb, pre-configured as +a non-exit relay. +3. tor-exit-relay. This is the tor binary with geoipdb, pre-configured +as an exit relay. +4. tor-bridge. This is the tor binary with geoipdb, pre-configured as +a publishing bridge. + +Why? + +We support a dizzying array of packages for an ever increasing number of +operating systems. Some packages you install, some are setup via native +operating system packaging systems, some are just download and run. +Developing a standard set of packages that contain the same things on +different OSes should be possible. Users currently have to configure +their software in varying ways, and then interact with their operating +system and network devices to help the Tor network. We should make it +very easy to get tor running as the user wishes. + +It would make the user choice clear. "I want to run tor as" can be +answered by which package they download and install. There is minimal +configuration to be done, and the packages should just work 'out of the +box'. + +This could also reduce support load. Instead of supporting a billion +apps and configs that may or may not be as anonymous/private as TBB, we +just support TBB. TBB becomes the focus on making it as zero-footprint +and anonymous as possible. + +(Where does this leave TAILS? If one wants to 'torify' everything, then +use TAILS; in a virtual machine, natively, whatever. If downloading TBB +sucks, downloading TAILS would be horrible. thandy updater for TAILS, +or does that defeat the point of a read-only OS?) + +What does this mean practically for each major operating system we +support? + +Microsoft Windows + +1. tor-client. The same TBB we ship today. +2. tor-relay. Vidalia and tor pre-configured as a non-exit relay. Look +at the current bridge-by-default bundle, just change the vidalia.conf to +be a non-exit relay. +3. tor-exit-relay. Vidalia and tor pre-configured as an exit relay. Look +at the current bridge-by-default bundle, just change the vidalia.conf to +be an exit relay. +4. tor-bridge. Vidalia and tor pre-configured as a bridge. Look +at the current bridge-by-default bundle. + +Apple OS X + +1. tor-client. The same TBB we ship today. +2. tor-relay. Vidalia and tor pre-configured as a non-exit relay. +Using TBB portable tor and vidalia, ship a vidalia.conf to be a non-exit +relay. +3. tor-exit-relay. Vidalia and tor pre-configured as an exit relay. +Using TBB portable tor and vidalia, ship a vidalia.conf to be an exit +relay. +4. tor-bridge. Vidalia and tor pre-configured as a bridge. +Using TBB portable tor and vidalia, ship a vidalia.conf to be a bridge. + +GNU/Linux (deb and rpm) + +1. tor-client. The same TBB we ship today. +2. tor-relay. Create tor-relay.(deb|rpm) that includes geoipdb and a +pre-configured torrc that is for a non-exit relay. +3. tor-exit-relay. Create tor-exit-relay.(deb|rpm) that includes geoipdb and a +pre-configured torrc that is for an exit relay. +4. tor-bridge. Create tor-bridge.(deb|rpm) that includes geoipdb and a +pre-configured torrc that is for a bridge. + +Obvious issues (to me) + +1. If a user wants to run both a tor-client and +tor-(relay|exit-relay|bridge) on the same host, we run into port +conflicts. At a minimum, the tor socks port, 9050 and control port, +9051 show up right away. For the tor-(relay|exit-relay|bridge) +packages, one can disable the socks port altogether, and just leave the +control port. I believe there is some work to make vidalia and tor +negotiate a control port number and choose that, assuming nothing else +uses it. This could be true for tor-* on start. It can default to +9050/9051, but if already taken, pick the next free port for socks and +control. + +Alternatively, each package chooses a different socksport/control port +combination. + +2. Users will still run into firewalls, NAT routers, and the like while +trying to get their tor relay working. This is the same situation we +have now, but it grossly simplifies the ability to get tor working. +Step 1: install tor package of your choice +Step 2: fight with your firewall/nat port-forwards +If we get upnp working in tor itself, this may or may not make it easier +for the users. + +3. The conversion from legacy to new packaging could be a mess. Relay +operators used to doing things one way will have to change. Users used +to installing tor and then configuring their apps will have to adjust. + +4. Installing a new tbb for every new release sucks, especially in +places with little bandwidth. Getting thandy working would solve this +issue. Having standardized packages for tor-clients may also make +thandy deployment easier, as it's the same software in each package, +just different binaries. + +5. The *BSD ports system would need to create different ports, or offer +make options that enable the different configs for non-exit, exit, and +bridge relay. This is also true for fink/macports. + +Of course, users should be able to create their own packages, based on +our published packaging scripts. + +Conclusion + +While a migration to a new set of packages could be painful, the world +after the flag day would get easier and easier over time. The package +sets are simplified, nearly all of our problems with configuring tor as +a relay or bridge go away, and it simplifies product management to +defined channels. We can then focus on security, anonymity, and +usability fixes for each of the defined channels. Improvements are +pushed out across all operating systems for each channel. Property changes on: projects/roadmaps/proposed-package-roadmap.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native

1 0

[tor/release-0.2.2] prepare for tomorrow's release
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit e084c6fd14caba9567af19cf33f25c4d7a0ac323 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 3 17:43:09 2011 -0400 prepare for tomorrow's release --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index a440c17..95e90e6 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.27-beta) +AM_INIT_AUTOMAKE(tor, 0.2.2.28-beta) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 7fe0304..d4b74f4 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.2.27-beta" +!define VERSION "0.2.2.28-beta" !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 e9b98f0..36f1fc1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,5 +233,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.2.27-beta" +#define VERSION "0.2.2.28-beta"

1 0

[tor/release-0.2.2] whoops
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit bb6ba2a17cdef37f919f71661f7004606f4ffd00 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 3 17:41:06 2011 -0400 whoops --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b526380..5c9b96c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -240,7 +240,7 @@ Changes in version 0.2.2.26-beta - 2011-05-17 on 0.2.0.10-alpha. o Removed features: - - Caches no longer download and serve e2 networkstatus documents + - Caches no longer download and serve v2 networkstatus documents unless FetchV2Networkstatus flag is set: these documents haven't haven't been used by clients or relays since 0.2.0.x. Resolves bug 3022.

1 0

[tor/release-0.2.2] fold in latest changes files
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit 7585a09a3b8b9816ba2b693645972322d3c5189e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 3 17:35:04 2011 -0400 fold in latest changes files --- ChangeLog | 41 ++++++++++++++++++++++++++++++++++++++--- changes/bug2355 | 8 -------- changes/bug2748 | 10 ---------- changes/bug3309 | 13 ------------- changes/bug3318 | 7 ------- changes/bug3321 | 7 ------- 6 files changed, 38 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12daf86..b526380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.2.28-beta - 2011-05-3? +Changes in version 0.2.2.28-beta - 2011-06-04 o Major bugfixes: - Don't decide to make a new descriptor when receiving a HUP signal. This bug has caused a lot of 0.2.2.x relays to disappear from the @@ -8,7 +8,7 @@ Changes in version 0.2.2.28-beta - 2011-05-3? - Don't try to build descriptors if "ORPort auto" is set and we don't know our actual ORPort yet. Fix for bug 3216; bugfix on 0.2.2.26-beta. - - Resolve a crash that occured when setting BridgeRelay to 1 with + - Resolve a crash that occurred when setting BridgeRelay to 1 with accounting enabled. Fixes bug 3228; bugfix on 0.2.2.18-alpha. - Apply circuit timeouts to opened hidden-service-related circuits based on the correct start time. Previously, we would apply the @@ -22,11 +22,24 @@ Changes in version 0.2.2.28-beta - 2011-05-3? 0.2.1.x and earlier, but caused many hidden service access attempts to fail with the adaptive CBT introduced in 0.2.2.2-alpha. Bugfix on 0.2.2.2-alpha; fixes another part of bug 1297. + - In ticket 2511 we fixed a case where you could use an unconfigured + bridge if you had configured it as a bridge the last time you ran + Tor. Now fix another edge case: if you had configured it as a bridge + but then switched to a different bridge via the controller, you + would still be willing to use the old one. Bugfix on 0.2.0.1-alpha; + fixes bug 3321. o Major features: - Add an __OwningControllerProcess configuration option and a TAKEOWNERSHIP control-port command. Now a Tor controller can ensure that when it exits, Tor will shut down. Implements feature 3049. + - If "UseBridges 1" is set and no bridges are configured, Tor will + now refuse to build any circuits until some bridges are set. + If "UseBridges auto" is set, Tor will use bridges if they are + configured and we are not running as a server, but otherwise will + make circuits as usual. The new default is "auto". Patch by anonym, + so the Tails LiveCD can stop automatically revealing you as a Tor + user on startup. o Minor bugfixes: - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option. @@ -38,6 +51,26 @@ Changes in version 0.2.2.28-beta - 2011-05-3? - Warn when the user configures two HiddenServiceDir lines that point to the same directory. Bugfix on 0.0.6 (the version introducing HiddenServiceDir); fixes bug 3289. + - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes + part of bug 2748; bugfix on 0.2.0.10-alpha. + - Log malformed requests for rendezvous descriptors as protocol + warnings, not warnings. Also, use a more informative log message + in case someone sees it at log level warning without prior + info-level messages. Fixes the other part of bug 2748; bugfix + on 0.2.0.10-alpha. + - Clear the table recording the time of the last request for each + hidden service descriptor from each HS directory on SIGNAL NEWNYM. + Previously, we would clear our HS descriptor cache on SIGNAL + NEWNYM, but if we had previously retrieved a descriptor (or tried + to) from every directory responsible for it, we would refuse to + fetch it again for up to 15 minutes. Bugfix on 0.2.2.25-alpha; + fixes bug 3309. + - Fix a log message that said "bits" while displaying a value in + bytes. Found by wanoskarnet. Fixes bug 3318; bugfix on + 0.2.0.1-alpha. + - When checking for 1024-bit keys, check for 1024 bits, not 128 + bytes. This allows Tor to correctly discard keys of length 1017 + through 1023. Bugfix on 0.0.9pre5. o Minor features: - Relays now log the reason for publishing a new relay descriptor, @@ -47,6 +80,8 @@ Changes in version 0.2.2.28-beta - 2011-05-3? instead use the "$key=nickname at address" format. This should be more useful, especially since nicknames are less and less likely to be unique. Resolves ticket 3045. + - Log (at info level) when purging pieces of hidden-service-client + state because of SIGNAL NEWNYM. o Removed options: - Remove undocumented option "-F" from tor-resolve: it hasn't done @@ -205,7 +240,7 @@ Changes in version 0.2.2.26-beta - 2011-05-17 on 0.2.0.10-alpha. o Removed features: - - Caches no longer download and serve v2 networkstatus documents + - Caches no longer download and serve e2 networkstatus documents unless FetchV2Networkstatus flag is set: these documents haven't haven't been used by clients or relays since 0.2.0.x. Resolves bug 3022. diff --git a/changes/bug2355 b/changes/bug2355 deleted file mode 100644 index ee0ae4b..0000000 --- a/changes/bug2355 +++ /dev/null @@ -1,8 +0,0 @@ - o Major features: - - If "UseBridges 1" is set and no bridges are configured, Tor will - now refuse to build any circuits until some bridges are set. - If "UseBridges auto" is set, Tor will use bridges if they are - configured and we are not running as a server, but otherwise - will make circuits as usual. The new default is "auto". Patch - by anonym. - diff --git a/changes/bug2748 b/changes/bug2748 deleted file mode 100644 index b522560..0000000 --- a/changes/bug2748 +++ /dev/null @@ -1,10 +0,0 @@ - o Minor bugfixes - - Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes - part of bug 2748; bugfix on 0.2.0.10-alpha. - - Log malformed requests for rendezvous descriptors as protocol - warnings, not warnings. Also, use a more informative log - message in case someone sees it at log level warning without - prior info-level messages. Fixes the other part of bug 2748; - bugfix on 0.2.0.10-alpha. - - diff --git a/changes/bug3309 b/changes/bug3309 deleted file mode 100644 index 104056d..0000000 --- a/changes/bug3309 +++ /dev/null @@ -1,13 +0,0 @@ - o Minor bugfixes: - - Clear the table recording the time of the last request for each - hidden service descriptor from each HS directory on SIGNAL - NEWNYM. Previously, we would clear our HS descriptor cache on - SIGNAL NEWNYM, but if we had previously retrieved a descriptor - (or tried to) from every directory responsible for it, we would - refuse to fetch it again for up to 15 minutes. Bugfix on - 0.2.2.25-alpha; fixes bug 3309. - - o Minor features: - - Log (at info level) when purging pieces of hidden-service-client - state on SIGNAL NEWNYM. - diff --git a/changes/bug3318 b/changes/bug3318 deleted file mode 100644 index 8a3c278..0000000 --- a/changes/bug3318 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - Fix a log message that said "bits" while displaying a value in - bytes. Found by wanoskarnet. Fixes bug 3318; bugfix on - 0.2.0.1-alpha. - - When checking for 1024-bit keys, check for 1024 bits, not 128 - bytes. This allows Tor to correctly discard keys of length - 1017 through 1023. Bugfix on 0.0.9pre5. diff --git a/changes/bug3321 b/changes/bug3321 deleted file mode 100644 index 3605efc..0000000 --- a/changes/bug3321 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - In bug 2511 we fixed a case where you could use an unconfigured - bridge if you had configured it as a bridge the last time you ran - Tor. Now fix another edge case: if you had configured it as a bridge - but then switched to a different bridge via the controller, you - would still be willing to use the old one. Bugfix on 0.2.0.1-alpha; - fixes bug 3321.

1 0

[tor/release-0.2.2] Merge branch 'bug3318c' into maint-0.2.2
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit 7aa20b20bffcbc4c9b4e3eb1c874616e1cab119f Merge: de069f5 bbf2fee Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 11:34:32 2011 -0400 Merge branch 'bug3318c' into maint-0.2.2 changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit d6d9df241cfd6bb4af18b57b45f725e2c6c79fb5 Merge: 66732b7 7aa20b2 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 3 15:25:54 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug2355 | 8 ++++++++ changes/bug2748 | 10 ++++++++++ changes/bug3309 | 13 +++++++++++++ changes/bug3318 | 7 +++++++ changes/bug3321 | 7 +++++++ doc/tor.1.txt | 10 +++++++--- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/common/procmon.c | 8 ++++---- src/or/circuitbuild.c | 17 ++++++++++++----- src/or/config.c | 42 ++++++++++++++++++++++++++---------------- src/or/connection.c | 4 ++-- src/or/dirserv.c | 5 +++-- src/or/main.c | 3 +-- src/or/or.h | 12 +++++++++++- src/or/rendclient.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- src/or/rendclient.h | 3 +++ src/or/rendcommon.c | 17 +++++++---------- src/or/router.c | 18 +++++++++++------- src/or/router.h | 3 ++- src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 22 files changed, 193 insertions(+), 58 deletions(-)

1 0

[tor/release-0.2.2] Report wrong key sizes correctly
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit 0fd3ad75daf925e8192aa1d44b229b3b7c29829d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:07:08 2011 -0400 Report wrong key sizes correctly When we introduced NEED_KEY_1024 in routerparse.c back in 0.2.0.1-alpha, I forgot to add a *8 when logging the length of a bad-length key. Bugfix for 3318 on 0.2.0.1-alpha. --- changes/bug3318 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug3318 b/changes/bug3318 new file mode 100644 index 0000000..38991c4 --- /dev/null +++ b/changes/bug3318 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a log message that said "bits" while displaying a value in + bytes. Fixes bug 3318; bugfix on 0.2.0.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1dcbc6a..3728e99 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3767,7 +3767,7 @@ token_check_object(memarea_t *area, const char *kwd, case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ if (tok->key && crypto_pk_keysize(tok->key) != PK_BYTES) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", - kwd, (int)crypto_pk_keysize(tok->key)); + kwd, (int)crypto_pk_keysize(tok->key)*8); RET_ERR(ebuf); } /* fall through */

1 0

[tor/release-0.2.2] Make last_hid_serv_requests functions less fragile
by arma＠torproject.org 03 Jun '11

03 Jun '11

commit a1d866edc9af82c2134590f7ee3c4e18156a655c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 2 02:24:18 2011 -0700 Make last_hid_serv_requests functions less fragile Previously, Tor would dereference a NULL pointer and crash if lookup_last_hid_serv_request were called before the first call to directory_clean_last_hid_serv_requests. As far as I can tell, that's currently impossible, but I want that undocumented invariant to go away in case I^Wwe break it someday. --- src/or/rendclient.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 29b9d26..ec6e3f2 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -377,7 +377,17 @@ rend_client_introduction_acked(origin_circuit_t *circ, * certain queries; keys are strings consisting of base32-encoded * hidden service directory identities and base32-encoded descriptor IDs; * values are pointers to timestamps of the last requests. */ -static strmap_t *last_hid_serv_requests = NULL; +static strmap_t *last_hid_serv_requests_ = NULL; + +/** Returns last_hid_serv_requests_, initializing it to a new strmap if + * necessary. */ +static strmap_t * +get_last_hid_serv_requests(void) +{ + if (!last_hid_serv_requests_) + last_hid_serv_requests_ = strmap_new(); + return last_hid_serv_requests_; +} /** Look up the last request time to hidden service directory hs_dir * for descriptor ID desc_id_base32. If set is non-zero, @@ -391,6 +401,7 @@ lookup_last_hid_serv_request(routerstatus_t *hs_dir, char hsdir_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; char hsdir_desc_comb_id[2 * REND_DESC_ID_V2_LEN_BASE32 + 1]; time_t *last_request_ptr; + strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); base32_encode(hsdir_id_base32, sizeof(hsdir_id_base32), hs_dir->identity_digest, DIGEST_LEN); tor_snprintf(hsdir_desc_comb_id, sizeof(hsdir_desc_comb_id), "%s%s", @@ -416,8 +427,7 @@ directory_clean_last_hid_serv_requests(void) { strmap_iter_t *iter; time_t cutoff = time(NULL) - REND_HID_SERV_DIR_REQUERY_PERIOD; - if (!last_hid_serv_requests) - last_hid_serv_requests = strmap_new(); + strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); for (iter = strmap_iter_init(last_hid_serv_requests); !strmap_iter_done(iter); ) { const char *key;

1 0