September 2013 - tor-commits - lists.torproject.org

[torbirdy/master] Update torbirdy.dtd
by sukhbir＠torproject.org 21 Sep '13

21 Sep '13

commit cf3bdfb5ecec6b1ec563edcd529cc464dbf28962 Author: Lazlo <github(a)lazlo.me> Date: Fri Sep 20 09:55:57 2013 +0200 Update torbirdy.dtd --- chrome/locale/nl/torbirdy.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/chrome/locale/nl/torbirdy.dtd b/chrome/locale/nl/torbirdy.dtd index 7662764..9c24381 100644 --- a/chrome/locale/nl/torbirdy.dtd +++ b/chrome/locale/nl/torbirdy.dtd @@ -8,27 +8,27 @@ <!ENTITY torbirdy.accountprefs.save.button "Opslaan"> <!ENTITY torbirdy.accountprefs.save.key "S"> -<!ENTITY torbirdy.prefs.title "TorBirdy configuratie"> +<!ENTITY torbirdy.prefs.title "TorBirdy Voorkeuren"> <!ENTITY torbirdy.prefs.save.button "Opslaan"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Annuleren"> -<!ENTITY torbirdy.prefs.extra2.button "Configuratie controleren"> +<!ENTITY torbirdy.prefs.extra2.button "Voorkeuren controleren"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy configuratie"> -<!ENTITY torbirdy.prefs.privacy.label "Privacy configuratie"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy instellingen"> +<!ENTITY torbirdy.prefs.privacy.label "Privacy instellingen"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail instellingen"> <!ENTITY torbirdy.prefs.security.label "Beveiligingsinstellingen"> -<!ENTITY torbirdy.prefs.recommended.text "Aanbevolen configuratie voor TorBirdy (Tor) gebruiken"> +<!ENTITY torbirdy.prefs.recommended.text "Aanbevolen instellingen voor TorBirdy (Tor) gebruiken"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Kies een anonimiseringsdienst"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Gebruik een aangepaste proxyconfiguratie"> +<!ENTITY torbirdy.prefs.customsettings.text "Gebruik een aangepaste proxy instelling"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> <!ENTITY torbirdy.prefs.socks_host.key "h"> -<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.label "Poort: "> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "Transparant Torification"> +<!ENTITY torbirdy.prefs.torification.label "Transparante Torificatie (waarschuwing: custom transproxy of Tor router vereist)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Globaal"> <!ENTITY torbirdy.prefs.imap.label "Ondersteuning voor push e-mail voor IMAP-accounts inschakelen [standaard: uitgeschakeld]"> @@ -43,17 +43,17 @@ <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "Schakel Thunderbird's automatische e-mail configuratie-wizard in [standaard: uitgeschakeld]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.renegotiation.label "sta connecties met servers die SSL/TLS met "safe renegotiation" toe [default: do not allow]"> +<!ENTITY torbirdy.prefs.renegotiation.label "Sta connecties met servers die SSL/TLS met "safe renegotiation" niet ondersteunen toe [standaard: niet toestaan]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Account-specifiek"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kies een account: "> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Bruikbaare hoofdserver(s)."> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Te gebruiken sleutelserver(s): "> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Gebruik Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label "Gebruik JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Gebruik Whonix"> -<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy voorkeuren"> +<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Voorkeuren"> <!ENTITY torbirdy.firstrun.title "Eerste gebruik van TorBirdy">

1 0

[doctor/master] Sending descriptor_checker.py notices to me rather than the list
by atagar＠torproject.org 21 Sep '13

21 Sep '13

commit a9112af77952605aaceb7a3381477a830ecf434e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 14:59:26 2013 -0700 Sending descriptor_checker.py notices to me rather than the list On reflection descriptor_checker.py provides us an alert of only two things: 1. An inability by stem to parse descriptors. This could be either due to malformed descriptor content or an issue with stem. 2. Directory authority outages. The first I'd rather not send to tor-consensus-health@, and the second is already provided by consensus_health_checker.py (though this script's notices are a little nicer). Hence I'm gonna keep this around as-is, except with notices going to me rather than the list. --- descriptor_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptor_checker.py b/descriptor_checker.py index 5df9092..ee715a9 100755 --- a/descriptor_checker.py +++ b/descriptor_checker.py @@ -86,7 +86,7 @@ def main(): def send_email(subject, descriptor_type, query): try: timestamp = datetime.datetime.now().strftime("%m/%d/%Y %H:%M") - util.send(subject, body_text = EMAIL_BODY % (descriptor_type, query.download_url, timestamp, query.error)) + util.send(subject, body_text = EMAIL_BODY % (descriptor_type, query.download_url, timestamp, query.error, destination = util.ERROR_ADDRESS)) except Exception, exc: log.warn("Unable to send email: %s" % exc)

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 21 Sep '13

21 Sep '13

commit 17eca45400b23ed8778c8a450dcea245208c92c5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 21 21:16:22 2013 +0000 Update translations for abouttor-homepage_completed --- zh_CN/aboutTor.dtd | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd new file mode 100644 index 0000000..7a0a3d0 --- /dev/null +++ b/zh_CN/aboutTor.dtd @@ -0,0 +1,73 @@ + + +<!ENTITY aboutTor.title "关于 Tor"> + +<!ENTITY aboutTor.outOfDateTorOn.label "但是该浏览器并非最新版本。"> +<!ENTITY aboutTor.outOfDateTorOff.label "另外，该浏览器并非最新版本。"> +<!ENTITY aboutTor.outOfDate2.label "请单击洋葱图标，然后选择“下载 Tor Browser Bundle”更新。"> + +<!ENTITY aboutTor.check.label "测试 Tor 网络设置"> + +<!ENTITY aboutTor.success.label "成功！"> +<!ENTITY aboutTor.success2.label "该浏览器已配置为使用 Tor 网络。"> +<!ENTITY aboutTor.success3.label "现在即可自由地匿名访问互联网。"> +<!ENTITY aboutTor.failure.label "出错了！"> +<!ENTITY aboutTor.failure2.label "Tor 无法在该浏览器下运行。"> +<!ENTITY aboutTor.failure3prefix.label "如需帮助，请联系："> +<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> +<!ENTITY aboutTor.failure3suffix.label "。"> + +<!ENTITY aboutTor.search.label "搜索"> + + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "搜索"> +<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "搜索"> +<!ENTITY aboutTor.searchSP.privacy.label "安全"> +<!ENTITY aboutTor.searchDDG.privacy.label "安全"> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> +<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "引擎"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "引擎"> +<!ENTITY aboutTor.searchSP.search.label "Startpage"> +<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> +<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> +<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> +<!ENTITY aboutTor.searchSP.search.afterLink.label "。"> +<!ENTITY aboutTor.searchDDG.search.afterLink.label "。"> + +<!ENTITY aboutTor.torInfo1.label "更多信息："> +<!ENTITY aboutTor.torInfo2.label "国家与 IP 地址："> +<!ENTITY aboutTor.torInfo3.label "出口节点："> +<!ENTITY aboutTor.torInfo4.label "本服务器不记录有关访问者的任何信息。"> +<!ENTITY aboutTor.whatnextQuestion.label "下一步？"> +<!ENTITY aboutTor.whatnextAnswer.label "仅仅使用 Tor 无法实现匿名浏览。为了确保身份安全，你可能需要改变某些浏览习惯。"> +<!ENTITY aboutTor.whatnext.label "保持匿名小技巧 »"> +<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.helpInfo1.label "你也可以帮忙！"> +<!ENTITY aboutTor.helpInfo2.label "可通过很多方式提供帮助，让 Tor 网络变得更快更强大："> +<!ENTITY aboutTor.helpInfo3.label "运行 Tor 中继节点 »"> +<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> +<!ENTITY aboutTor.helpInfo4.label "提供志愿服务 »"> +<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> +<!ENTITY aboutTor.helpInfo5.label "捐助 »"> +<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> + +<!ENTITY aboutTor.footer.label "The Tor Project 是一家美国 501(c)(3) 非营利组织，致力于在线匿名与隐私的研究、开发与教育。"> +<!ENTITY aboutTor.learnMore.label "了解更多有关 The Tor Project 的信息 »"> +<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Sep '13

21 Sep '13

commit 5ace492b48ebd3e6624872bfb7c034affdff37e9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 21 21:16:20 2013 +0000 Update translations for abouttor-homepage --- zh_CN/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index ac17dc8..7a0a3d0 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -32,7 +32,7 @@ - The sentence contains two embedded links for "securely" and - the search engine ("Startpage" or "DuckDuckGo"). --> -<!ENTITY aboutTor.searchSPPost.link ""> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "搜索"> <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "搜索"> @@ -42,8 +42,8 @@ <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "和"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "和"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "引擎"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "引擎"> <!ENTITY aboutTor.searchSP.search.label "Startpage"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 21 Sep '13

21 Sep '13

commit c8d529f424a316c55b8ce35511dcdbf8ee5d75f5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 21 21:16:05 2013 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index f73ac12..2e3dbbd 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -12,10 +12,10 @@ <!ENTITY torbirdy.prefs.save.button "保存"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "取消"> -<!ENTITY torbirdy.prefs.extra1.button "恢复默认值"> -<!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button "测试代理设置"> -<!ENTITY torbirdy.prefs.extra2.key "g"> +<!ENTITY torbirdy.prefs.extra2.button "恢复默认设置"> +<!ENTITY torbirdy.prefs.extra2.key "d"> +<!ENTITY torbirdy.prefs.testproxy.button "测试代理设置"> +<!ENTITY torbirdy.prefs.testproxy.key "n"> <!ENTITY torbirdy.prefs.proxy.label "代理"> <!ENTITY torbirdy.prefs.privacy.label "隐私"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 21 Sep '13

21 Sep '13

commit 83b0a83a1604f7c850dfffde4a3ac4ee65efc798 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 21 21:16:00 2013 +0000 Update translations for torbirdy --- zh_CN/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 95be684..2e3dbbd 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -15,7 +15,7 @@ <!ENTITY torbirdy.prefs.extra2.button "恢复默认设置"> <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "测试代理设置"> -<!ENTITY torbirdy.prefs.testproxy.key ""> +<!ENTITY torbirdy.prefs.testproxy.key "n"> <!ENTITY torbirdy.prefs.proxy.label "代理"> <!ENTITY torbirdy.prefs.privacy.label "隐私"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Sep '13

21 Sep '13

commit ff5d62b16ce735bf7acf453940ae26ef176ebb8f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 21 20:46:12 2013 +0000 Update translations for abouttor-homepage --- zh_CN/aboutTor.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index ab37e2b..ac17dc8 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -38,12 +38,12 @@ <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "搜索"> <!ENTITY aboutTor.searchSP.privacy.label "安全"> <!ENTITY aboutTor.searchDDG.privacy.label "安全"> -<!ENTITY aboutTor.searchSP.privacy.link ""> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "和"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "和"> <!ENTITY aboutTor.searchSP.search.label "Startpage"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 21 Sep '13

21 Sep '13

commit 9e7d30faf54b4fcda2c5331214b8e23ef6106d47 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 21 20:16:01 2013 +0000 Update translations for torbirdy --- pt_BR/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index d85137b..f1b565d 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -17,9 +17,9 @@ <!ENTITY torbirdy.prefs.testproxy.button "Testar as Configurações do Proxy"> <!ENTITY torbirdy.prefs.testproxy.key ""> <!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.privacy.label "Privacidade"> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.security.label "Segurança"> <!ENTITY torbirdy.prefs.recommended.text "Utilizar as configurações de proxy recomendadas para o TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escolher um serviço de anonimato">

1 0

[stem/master] Disable caching of HiddenServiceOptions
by atagar＠torproject.org 21 Sep '13

21 Sep '13

commit 1d2fe8a218768eb5a1713cd2daa6d54df0d6c7ca Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 12:05:25 2013 -0700 Disable caching of HiddenServiceOptions Stem's controller has pretty straight forward caching for tor's configuration options. If you call 'GETCONF foo' then the value of foo is cached until you call either 'SETCONF foo' or 'RESETCONF foo'. In general this is all well and good, but HiddenServiceOptions behave in a different fashion. With those the caller might call 'SETCONF HiddenServiceDir' and expect 'GETCONF HiddenServiceOptions' to change. As such, opting out of caching hidden service options. This was a bug uncovered by wayzard on... http://stackoverflow.com/questions/18777837/tors-stem-module-python-loading… https://trac.torproject.org/projects/tor/ticket/9792 Prior to this fix... >>> from stem.control import Controller >>> controller = Controller.from_port() >>> controller.authenticate() >>> controller.get_conf_map('HiddenServiceOptions') {'HiddenServiceOptions': []} >>> controller.set_options([('HiddenServiceDir','/tmp/my_hidden_service'), ('HiddenServicePort', '1236 127.0.0.1:1236')]) >>> controller.get_conf_map('HiddenServiceOptions') {'HiddenServiceOptions': []} Now it behaves as expected... >>> from stem.control import Controller >>> controller = Controller.from_port() >>> controller.authenticate() >>> controller.get_conf_map('HiddenServiceOptions') {'HiddenServiceOptions': []} >>> controller.set_options([('HiddenServiceDir','/tmp/my_hidden_service'), ('HiddenServicePort', '1236 127.0.0.1:1236')]) >>> controller.get_conf_map('HiddenServiceOptions') {'HiddenServicePort': ['1236 127.0.0.1:1236'], 'HiddenServiceDir': ['/tmp/my_hidden_service']} --- docs/change_log.rst | 1 + stem/control.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 75a5e81..b7840b4 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -48,6 +48,7 @@ The following are only available within stem's `git repository * Added :func:`~stem.control.Controller.get_user` method to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.get_pid` method to the :class:`~stem.control.Controller` * :class:`~stem.response.events.StreamEvent` didn't recognize IPv6 addresses (:trac:`9181`) + * :func:`~stem.control.Controller.get_conf` mistakenly cached hidden service related options (:trac:`9792`) * **Descriptors** diff --git a/stem/control.py b/stem/control.py index 8233b2a..64eecc4 100644 --- a/stem/control.py +++ b/stem/control.py @@ -204,6 +204,7 @@ MAPPED_CONFIG_KEYS = { } # unchangeable GETINFO parameters + CACHEABLE_GETINFO_PARAMS = ( 'version', 'config-file', @@ -217,6 +218,19 @@ CACHEABLE_GETINFO_PARAMS = ( 'process/descriptor-limit', ) +# GETCONF parameters we shouldn't cache. This includes hidden service +# perameters due to the funky way they're set and retrieved (for instance, +# 'SETCONF HiddenServiceDir' effects 'GETCONF HiddenServiceOptions'). + +UNCACHEABLE_GETCONF_PARAMS = ( + 'hiddenserviceoptions', + 'hiddenservicedir', + 'hiddenserviceport', + 'hiddenserviceversion', + 'hiddenserviceauthorizeclient', + 'hiddenserviceoptions', +) + # number of sequential attempts before we decide that the Tor geoip database # is unavailable GEOIP_FAILURE_THRESHOLD = 5 @@ -1465,6 +1479,11 @@ class Controller(BaseController): if self.is_caching_enabled(): to_cache = dict((k.lower(), v) for k, v in response.entries.items()) + + for key in UNCACHEABLE_GETCONF_PARAMS: + if key in to_cache: + del to_cache[key] + self._set_cache(to_cache, "getconf") # Maps the entries back to the parameters that the user requested so the

1 0

[stem/master] Adding default and constraints for Support022HiddenServices
by atagar＠torproject.org 21 Sep '13

21 Sep '13

commit cfec958ddec6c1b104def1fdb40cacbb4e73b79d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 21 11:32:03 2013 -0700 Adding default and constraints for Support022HiddenServices Reflecting constraints for a new param in network status documents... https://gitweb.torproject.org/torspec.git/commitdiff/6c974c5 --- stem/descriptor/networkstatus.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index cfe6b2f..8d615fa 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -127,6 +127,7 @@ DEFAULT_PARAMS = { "cbttestfreq": 60, "cbtmintimeout": 2000, "cbtinitialtimeout": 60000, + "Support022HiddenServices": 1, } # KeyCertificate fields, tuple is of the form... @@ -818,6 +819,8 @@ class _DocumentHeader(object): minimum = self.params.get("cbtmintimeout", minimum) elif key == "UseOptimisticData": minimum, maximum = 0, 1 + elif key == "Support022HiddenServices": + minimum, maximum = 0, 1 if value < minimum or value > maximum: raise ValueError("'%s' value on the params line must be in the range of %i - %i, was %i" % (key, minimum, maximum, value))

1 0