tor-commits August 2020

tor-commits@lists.torproject.org

18 participants
1961 discussions

[tpo/master] Privchat #2 - content update
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 4910b4c7fa55ae74151765fc115f70acf9cb99de Author: antonela <antonela(a)torproject.org> Date: Thu Aug 6 14:51:01 2020 -0300 Privchat #2 - content update --- assets/static/images/privchat/privchat1-cover.png | Bin 0 -> 955705 bytes templates/privchat.html | 66 ++++++++++++++-------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/assets/static/images/privchat/privchat1-cover.png b/assets/static/images/privchat/privchat1-cover.png new file mode 100644 index 00000000..7ea60514 Binary files /dev/null and b/assets/static/images/privchat/privchat1-cover.png differ diff --git a/templates/privchat.html b/templates/privchat.html index e6c58f00..372bd384 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -22,20 +22,15 @@ </div> - <div class="container py-3 mt-5"> - <p class="h2 text-primary" target="_blank">{{ _('Chapter #1 - Online Privacy in 2020: Activism & COVID-19') }} - <a class="btn btn-small bg-primary text-light ml-4 mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> + <p class="h2 text-primary" target="_blank">Chapter #2 - the Good, the Bad, and the Ugly of Censorship Circumvention <div> - <p><span class="text-primary nick"><mark>June 23th ∙ 1400 EDT ∙ 1800 UTC ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> + <p><span class="text-primary nick"><mark>August XXth ∙ 1400 EDT ∙ 1800 UTC ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> </div> + <a class="btn btn-small bg-primary text-light my-4" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> <div> <p class="font-family-serif"> - When the COVID-19 pandemic hit most countries around the world, many governments looked for technology to trace the spread of the virus in order to fight the pandemic. Contact tracing practices and technologies raised many questions about privacy, particularly: is it possible to trace the virus while respecting people's privacy? - - Now amidst the uprising in the U.S. against systemic racism, followed by protests all around the world, the central question about contact tracing, privacy, and surveillance becomes critical. Can the technology used for tracking the virus be used to track protesters? Will it be? - - For our first ever PrivChat, the Tor Project is bringing you three amazing guests to chat with us about privacy in this context. + Every year, internet censorship increases globally. From network level blocking to nation-wide internet blackouts, governments and private companies have powerful tools to restrict information and hault connection between people. Many people, groups, and organizations are doing innovative work to study, measure, and fight back against internet censorship--and they are helping millions of people connect more regularly and safely to the internet. Despite these successes, we're faced with well-funded adversaries that have billions of dollars to spend on censorship mechanisms, and the arms race is ongoing. The second edition of PriChat with Tor will be about the Good, the Bad and the Ugly that is happening in the front lines of censorship circumvention. In a world where censorship technology is increasingly sophisticated and bought and sold between nations, so is our creativity to measure it and build tools to bypass it, as well as the willingness of people to fight back. But is i t enough? What are the barriers facing the people and organizations fighting for internet freedom? </p> </div> </div> @@ -48,37 +43,36 @@ <div class="card flex-row flex-wrap py-3 mb-5"> <div class="col-3"> - <img class="card-img-top" src="{{ '/static/images/privchat/carmela.png' }}" alt="Carmela Troncoso"> + <img class="card-img-top" src="{{ '/static/images/privchat/.png' }}" alt=""> </div> <div class="col"> <div class="card-block px-2"> - <h4 class="display-4 text-primary">{{ _('Carmela Troncoso') }}</h4> - <p class="text-tpo">Carmela Troncoso is an Assistant Professor at EPFL (Switzerland) where she heads the SPRING Lab. She holds a Master's degree in Telecommunication Engineering from the University of Vigo (2006) and a Ph.D. in Engineering from the KU Leuven (2011). Before arriving to EPFL she was a Faculty member at the IMDEA Software Institute (Spain) for 2 years; the Security and Privacy Technical Lead at Gradiant working closely with industry to deliver secure and privacy friendly solutions to the market for 4 years; and a pos-doctoral researcher at the COSIC Group.<br/> Carmela's research focuses on security and privacy. Her thesis “Design and Analysis methods for Privacy Technologies” received the European Research Consortium for Informatics and Mathematics Security and Trust Management Best Ph.D. Thesis Award; and her work on Privacy Engineering received the CNIL-INRIA Privacy Protection Award 2017. She regularly publishes in the most prestigious venues in Sec urity (e.g. ACM Conference on Computer Security or USENIX Security Symposium) and Privacy (Privacy Enhancing Technologies).</p> + <h4 class="display-4 text-primary">{{ _('Panelist 1') }}</h4> + <p class="text-tpo"></p> </div> </div> </div> <div class="card flex-row flex-wrap py-3 mb-5"> <div class="col-3"> - <img class="card-img-top" src="{{ '/static/images/privchat/dkg.png' }}" alt="Daniel Kahn Gillmor"> + <img class="card-img-top" src="{{ '/static/images/privchat/.png' }}" alt=""> </div> <div class="col"> <div class="card-block px-2"> - <h4 class="display-4 text-primary">{{ _('Daniel Kahn Gillmor') }}</h4> - <p class="text-tpo">Daniel Kahn Gillmor is a Senior Staff Technologist for ACLU’s Speech, Privacy, and Technology Project, focused on the way our technical infrastructure shapes society and impacts civil liberties.<br/> As a free software developer and member of the Debian project, he contributes to fundamental tools that shape the possibilities of our information-rich environment.<br/> As a participant in the IETF he fosters the creation of new generations of networking and cryptographic protocols designed and optimized for privacy and security. He is an anti-surveillance advocate for privacy, justice, free speech, and data sovereignty. Daniel is a graduate of Brown University’s computer science program.</p> + <h4 class="display-4 text-primary">{{ _('Panelist 2') }}</h4> + <p class="text-tpo"></p> </div> </div> </div> <div class="card flex-row flex-wrap py-3 mb-5"> <div class="col-3"> - <img class="card-img-top" src="{{ '/static/images/privchat/matt.png' }}" alt="Matt Mitchell"> + <img class="card-img-top" src="{{ '/static/images/privchat/.png' }}" alt=""> </div> <div class="col"> <div class="card-block px-2"> - <h4 class="display-4 text-primary">{{ _('Matt Mitchell ') }}</h4> - <p class="text-tpo">Matt Mitchell is a hacker and Tech Fellow at The Ford Foundation. Matt is working with the BUILD and Technology and Society teams at Ford Foundation to develop digital security strategy, technical assistance offerings, and safety and security measures for the foundation’s grantee partners. <br/> Committed to using his digital skills — as hacker, developer, operational security trainer, security researcher, and data journalist — for good, Matt has worked in various capacities at the intersection of technology and social justice. Formerly the Director of Digital Safety & Privacy for Tactical Tech (also known as the Tactical Technology Collective). Matt worked leading security training efforts, curricula, and organizational security for Tactical Tech in their mission to raise awareness about privacy, provide tools for digital security, and mobilize people to turn information into action.<br/> - Matt is a well known security researcher, operational security trainer, and data journalist who founded & leads <a href="ttps://twitter.com/cryptoHarlem" title="CryptoHarlem" target="_blank">CryptoHarlem</a>, impromptu workshops teaching basic cryptography tools to the predominately African American community in upper Manhattan.</p> + <h4 class="display-4 text-primary">{{ _('Panelist 3') }}</h4> + <p class="text-tpo"></p> </div> </div> </div> @@ -90,12 +84,12 @@ <div class="card flex-row flex-wrap py-3"> <div class="col-3"> - <img class="card-img-top" src="{{ '/static/images/privchat/roger.png' }}" alt="Roger Dingledine"> + <img class="card-img-top" src="{{ '/static/images/privchat/.png' }}" alt=""> </div> <div class="col"> <div class="card-block px-2"> - <h4 class="display-4 text-primary">{{ _('Roger Dingledine') }}</h4> - <p class="text-tpo">Roger Dingledine is president and co-founder of the Tor Project, a nonprofit that develops free and open source software to protect people from tracking, censorship, and surveillance online.<br/> Wearing one hat, Roger works with journalists and activists on many continents to help them understand and defend against the threats they face. Wearing another, he is a lead researcher in the online anonymity field, coordinating and mentoring academic researchers working on Tor-related topics. Since 2002 he has helped organize the yearly international Privacy Enhancing Technologies Symposium (PETS).<br/> Among his achievements, Roger was chosen by the MIT Technology Review as one of its top 35 innovators under 35, he co-authored the Tor design paper that won the Usenix Security "Test of Time" award, and he has been recognized by Foreign Policy magazine as one of its top 100 global thinkers.</p> + <h4 class="display-4 text-primary">{{ _('Host') }}</h4> + <p class="text-tpo"></p> </div> </div> </div> @@ -109,3 +103,31 @@ <h3 class="preamble text-light text-center mx-auto">Your donations make this series and our work at Tor possible. <br/> The best way to support our work is to <a class="text-success" href="https://donate.torproject.org/monthly-giving" target="_blank">become a monthly donor.</a></h3> </div> </div> + +<div class="container pt-5 justify-content-center"> + <h4>Past Editions</h4> + + <div class="row"> + <div class="container"> + + <div class="p-5 mt-5 border" id="chapter-1"> + <img class="card-img-top mb-5" src="{{ '/static/images/privchat/privchat1-cover.png' }}" alt="PrivChat with Tor"> + <p class="h2 text-primary" target="_blank">Chapter #1 - Online Privacy in 2020: Activism & COVID-19</p> + <div> + <p><span class="text-primary nick"><mark>With Carmela Troncoso, Daniel Kahn Gillmor and Matt Michell. Hosted by Roger Dingledine.</mark></span></p> + </div> + <a class="btn btn-small bg-primary text-light mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fab fa-youtube"></i>Watch</a> + <div> + <p class="font-family-serif"> + When the COVID-19 pandemic hit most countries around the world, many governments looked for technology to trace the spread of the virus in order to fight the pandemic. Contact tracing practices and technologies raised many questions about privacy, particularly: is it possible to trace the virus while respecting people's privacy? + + Now amidst the uprising in the U.S. against systemic racism, followed by protests all around the world, the central question about contact tracing, privacy, and surveillance becomes critical. Can the technology used for tracking the virus be used to track protesters? Will it be? + + For our first ever PrivChat, the Tor Project is bringing you three amazing guests to chat with us about privacy in this context. + </p> + </div> + </div> + + </div> + </div> +</div>

1 0

[onionperf/develop] Measure static guard nodes.
by karsten＠torproject.org 20 Aug '20

20 Aug '20

commit e9fd47d95db102b3a7ace36fa412e18d182c5fa4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 16 21:30:07 2020 +0200 Measure static guard nodes. Add --drop-guards parameter to use and drop guards after a given number of hours. Implements #33399. --- onionperf/measurement.py | 7 ++++--- onionperf/monitor.py | 18 +++++++++++++----- onionperf/onionperf | 9 ++++++++- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 4a58bc4..899b277 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -172,7 +172,7 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni class Measurement(object): - def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, privatedir_path, nickname, oneshot, additional_client_conf=None, torclient_conf_file=None, torserver_conf_file=None, single_onion=False): + def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, privatedir_path, nickname, oneshot, additional_client_conf=None, torclient_conf_file=None, torserver_conf_file=None, single_onion=False, drop_guards_interval_hours=None): self.tor_bin_path = tor_bin_path self.tgen_bin_path = tgen_bin_path self.datadir_path = datadir_path @@ -188,6 +188,7 @@ class Measurement(object): self.torclient_conf_file = torclient_conf_file self.torserver_conf_file = torserver_conf_file self.single_onion = single_onion + self.drop_guards_interval_hours = drop_guards_interval_hours def run(self, do_onion=True, do_inet=True, client_tgen_listen_port=58888, client_tgen_connect_ip='0.0.0.0', client_tgen_connect_port=8080, client_tor_ctl_port=59050, client_tor_socks_port=59000, server_tgen_listen_port=8080, server_tor_ctl_port=59051, server_tor_socks_port=59001): @@ -388,7 +389,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory tor_config = tor_config + f.read() if name == "client" and self.additional_client_conf: tor_config += self.additional_client_conf - if not 'UseEntryGuards' in tor_config and not 'UseBridges' in tor_config: + if not 'UseEntryGuards' in tor_config and not 'UseBridges' in tor_config and self.drop_guards_interval_hours == 0: tor_config += "UseEntryGuards 0\n" if name == "server" and self.single_onion: tor_config += "HiddenServiceSingleHopMode 1\nHiddenServiceNonAnonymousMode 1\n" @@ -467,7 +468,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory torctl_events = [e for e in monitor.get_supported_torctl_events() if e not in ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR']] newnym_interval_seconds = 300 - torctl_args = (control_port, torctl_writable, torctl_events, newnym_interval_seconds, self.done_event) + torctl_args = (control_port, torctl_writable, torctl_events, newnym_interval_seconds, self.drop_guards_interval_hours, self.done_event) torctl_helper = threading.Thread(target=monitor.tor_monitor_run, name="torctl_{0}_helper".format(name), args=torctl_args) torctl_helper.start() self.threads.append(torctl_helper) diff --git a/onionperf/monitor.py b/onionperf/monitor.py index 5387bff..ac6fea9 100644 --- a/onionperf/monitor.py +++ b/onionperf/monitor.py @@ -22,7 +22,7 @@ class TorMonitor(object): self.writable = writable self.events = events - def run(self, newnym_interval_seconds=None, done_ev=None): + def run(self, newnym_interval_seconds=None, drop_guards_interval_hours=0, done_ev=None): with Controller.from_port(port=self.tor_ctl_port) as torctl: torctl.authenticate() @@ -54,6 +54,10 @@ class TorMonitor(object): # let stem run its threads and log all of the events, until user interrupts try: interval_count = 0 + if newnym_interval_seconds is not None: + next_newnym = newnym_interval_seconds + if drop_guards_interval_hours > 0: + next_drop_guards = drop_guards_interval_hours * 3600 while done_ev is None or not done_ev.is_set(): # if self.filepath != '-' and os.path.exists(self.filepath): # with open(self.filepath, 'rb') as sizef: @@ -61,9 +65,13 @@ class TorMonitor(object): # logging.info(msg) sleep(1) interval_count += 1 - if newnym_interval_seconds is not None and interval_count >= newnym_interval_seconds: - interval_count = 0 + if newnym_interval_seconds is not None and interval_count >= next_newnym: + next_newnym += newnym_interval_seconds torctl.signal(Signal.NEWNYM) + if drop_guards_interval_hours > 0 and interval_count >= next_drop_guards: + next_drop_guards += drop_guards_interval_hours * 3600 + torctl.drop_guards() + except KeyboardInterrupt: pass # the user hit ctrl+c @@ -79,6 +87,6 @@ class TorMonitor(object): unix_ts = (utcnow - epoch).total_seconds() writable.write("{0} {1:.02f} {2}".format(now.strftime("%Y-%m-%d %H:%M:%S"), unix_ts, msg)) -def tor_monitor_run(tor_ctl_port, writable, events, newnym_interval_seconds, done_ev): +def tor_monitor_run(tor_ctl_port, writable, events, newnym_interval_seconds, drop_guards_interval_hours, done_ev): torctl_monitor = TorMonitor(tor_ctl_port, writable, events) - torctl_monitor.run(newnym_interval_seconds=newnym_interval_seconds, done_ev=done_ev) + torctl_monitor.run(newnym_interval_seconds=newnym_interval_seconds, drop_guards_interval_hours=drop_guards_interval_hours, done_ev=done_ev) diff --git a/onionperf/onionperf b/onionperf/onionperf index a7d32f6..52a779f 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -194,6 +194,12 @@ def main(): action="store", dest="tgenconnectport", default=8080) + measure_parser.add_argument('--drop-guards', + help="""Use and drop guards every N > 0 hours, or do not use guards at all if N = 0""", + metavar="N", type=type_nonnegative_integer, + action="store", dest="drop_guards_interval_hours", + default=0) + onion_or_inet_only_group = measure_parser.add_mutually_exclusive_group() onion_or_inet_only_group.add_argument('-o', '--onion-only', @@ -360,7 +366,8 @@ def measure(args): args.additional_client_conf, args.torclient_conf_file, args.torserver_conf_file, - args.single_onion) + args.single_onion, + args.drop_guards_interval_hours) meas.run(do_onion=not args.inet_only, do_inet=not args.onion_only,

1 0

[onionperf/develop] Merge branch 'task-33399' into develop
by karsten＠torproject.org 20 Aug '20

20 Aug '20

commit 4ff257c4270c0d1e5fd0f1ef76e640696ec2c514 Merge: e333be2 e9fd47d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 20 15:05:23 2020 +0200 Merge branch 'task-33399' into develop onionperf/measurement.py | 7 ++++--- onionperf/monitor.py | 18 +++++++++++++----- onionperf/onionperf | 9 ++++++++- 3 files changed, 25 insertions(+), 9 deletions(-)

1 0

[onionperf/develop] Tweak #33399 patch.
by karsten＠torproject.org 20 Aug '20

20 Aug '20

commit dfec0b8960ac214f63985dfc317ffce750ef5922 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 20 15:40:25 2020 +0200 Tweak #33399 patch. - Add a change log entry. - Pick are more sensible default for `drop_guards_interval_hours`, also to fix unit tests. --- CHANGELOG.md | 5 +++++ onionperf/measurement.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a86ee..c31a40e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Changes in version 0.7 - 2020-??-?? + + - Add `onionperf measure --drop-guards` parameter to use and drop + guards after a given number of hours. Implements #33399. + # Changes in version 0.6 - 2020-08-08 - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 1a5f3bb..709fbc6 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -173,7 +173,7 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni class Measurement(object): - def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, privatedir_path, nickname, oneshot, additional_client_conf=None, torclient_conf_file=None, torserver_conf_file=None, single_onion=False, drop_guards_interval_hours=None): + def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, privatedir_path, nickname, oneshot, additional_client_conf=None, torclient_conf_file=None, torserver_conf_file=None, single_onion=False, drop_guards_interval_hours=0): self.tor_bin_path = tor_bin_path self.tgen_bin_path = tgen_bin_path self.datadir_path = datadir_path

1 0

[tor-browser/tor-browser-80.0b2-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit c2228fa0593281dba61a9f4bad0014943a88d634 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 19 19:20:43 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 027e6a152655..45419d001a7b 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -8,12 +8,10 @@ const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); class RequestBridgeDialog { constructor() { this._dialog = null; - this._submitCommand = null; this._submitButton = null; this._dialogDescription = null; this._captchaImage = null; this._captchaEntryTextbox = null; - this._captchaRefreshCommand = null; this._captchaRefreshButton = null; this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; @@ -26,12 +24,8 @@ class RequestBridgeDialog { submitButton: "accept" /* not really a selector but a key for dialog's getButton */, dialogDescription: "description#torPreferences-requestBridge-description", - submitCommand: "command#torPreferences-requestBridge-submitCommand", captchaImage: "image#torPreferences-requestBridge-captchaImage", - captchaEntryTextbox: - "input#torPreferences-requestBridge-captchaTextbox", - refreshCaptchaCommand: - "command#torPreferences-requestBridge-refreshCaptchaCommand", + captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox", refreshCaptchaButton: "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: @@ -45,7 +39,8 @@ class RequestBridgeDialog { const selectors = RequestBridgeDialog.selectors; this._dialog = dialog; - this._dialog.setAttribute( + const dialogWin = dialog.parentElement; + dialogWin.setAttribute( "title", TorStrings.settings.requestBridgeDialogTitle ); @@ -61,16 +56,17 @@ class RequestBridgeDialog { } else if (bridges) { this._bridges = bridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + this._dialog.cancelDialog(); } }); - this._submitCommand = this._dialog.querySelector(selectors.submitCommand); - this._submitButton = this._dialog.getButton(selectors.submitButton); this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha); - this._submitButton.setAttribute("command", this._submitCommand.id); this._submitButton.disabled = true; + this._dialog.addEventListener("dialogaccept", e => { + e.preventDefault(); + this.onSubmitCaptcha(); + }); this._dialogDescription = this._dialog.querySelector( selectors.dialogDescription @@ -93,30 +89,14 @@ class RequestBridgeDialog { TorStrings.settings.captchaTextboxPlaceholder ); this._captchaEntryTextbox.disabled = true; - this._captchaEntryTextbox.onkeypress = evt => { - const ENTER_KEY = 13; - if (evt.keyCode == ENTER_KEY) { - // logically same as pressing the 'submit' button of the parent dialog - this.onSubmitCaptcha(); - return false; - } - return true; - }; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { this._submitButton.disabled = this._captchaEntryTextbox.value == ""; }; - this._captchaRefreshCommand = this._dialog.querySelector( - selectors.refreshCaptchaCommand - ); this._captchaRefreshButton = this._dialog.querySelector( selectors.refreshCaptchaButton ); - this._captchaRefreshButton.setAttribute( - "command", - this._captchaRefreshCommand.id - ); this._captchaRefreshButton.disabled = true; this._incorrectCaptchaHbox = this._dialog.querySelector( @@ -183,7 +163,9 @@ class RequestBridgeDialog { this._bridges = aBridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); }) .catch(aError => { this._bridges = []; diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml index 1081194caf50..64c4507807fb 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml @@ -3,13 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-requestBridge-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="Request Bridge" - buttons="cancel,accept" - role="dialog"> - <command id="torPreferences-requestBridge-submitCommand" oncommand="requestBridgeDialog.onSubmitCaptcha();"/> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-requestBridge-dialog" + buttons="accept,cancel">  @@ -18,8 +16,9 @@ <image id="torPreferences-requestBridge-captchaImage" flex="1"/> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/> - <command id="torPreferences-requestBridge-refreshCaptchaCommand" oncommand="requestBridgeDialog.onRefreshCaptcha();"/> - <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://browser/skin/reload.svg"/> + <button id="torPreferences-requestBridge-refreshCaptchaButton" + image="chrome://browser/skin/reload.svg" + oncommand="requestBridgeDialog.onRefreshCaptcha();"/> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> @@ -32,4 +31,5 @@ let dialog = document.getElementById("torPreferences-requestBridge-dialog"); requestBridgeDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm index 70e49ac048f8..ba4b76738447 100644 --- a/browser/components/torpreferences/content/torLogDialog.jsm +++ b/browser/components/torpreferences/content/torLogDialog.jsm @@ -23,7 +23,8 @@ class TorLogDialog { _populateXUL(aDialog) { this._dialog = aDialog; - this._dialog.setAttribute("title", TorStrings.settings.torLogDialogTitle); + const dialogWin = this._dialog.parentElement; + dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle); this._logTextarea = this._dialog.querySelector( TorLogDialog.selectors.logTextarea diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml index ae0f4b294204..9c17f8132978 100644 --- a/browser/components/torpreferences/content/torLogDialog.xhtml +++ b/browser/components/torpreferences/content/torLogDialog.xhtml @@ -3,11 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-torLog-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - buttons="accept,extra1" - role="dialog"> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-torLog-dialog" + buttons="accept,extra1"> <html:textarea id="torPreferences-torDialog-textarea" multiline="true" @@ -19,4 +19,5 @@ let dialog = document.getElementById("torPreferences-torLog-dialog"); torLogDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 76ee81e0323d2416848b4e03aceebd722f752da3 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 19 19:20:43 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 027e6a152655..45419d001a7b 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -8,12 +8,10 @@ const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); class RequestBridgeDialog { constructor() { this._dialog = null; - this._submitCommand = null; this._submitButton = null; this._dialogDescription = null; this._captchaImage = null; this._captchaEntryTextbox = null; - this._captchaRefreshCommand = null; this._captchaRefreshButton = null; this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; @@ -26,12 +24,8 @@ class RequestBridgeDialog { submitButton: "accept" /* not really a selector but a key for dialog's getButton */, dialogDescription: "description#torPreferences-requestBridge-description", - submitCommand: "command#torPreferences-requestBridge-submitCommand", captchaImage: "image#torPreferences-requestBridge-captchaImage", - captchaEntryTextbox: - "input#torPreferences-requestBridge-captchaTextbox", - refreshCaptchaCommand: - "command#torPreferences-requestBridge-refreshCaptchaCommand", + captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox", refreshCaptchaButton: "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: @@ -45,7 +39,8 @@ class RequestBridgeDialog { const selectors = RequestBridgeDialog.selectors; this._dialog = dialog; - this._dialog.setAttribute( + const dialogWin = dialog.parentElement; + dialogWin.setAttribute( "title", TorStrings.settings.requestBridgeDialogTitle ); @@ -61,16 +56,17 @@ class RequestBridgeDialog { } else if (bridges) { this._bridges = bridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + this._dialog.cancelDialog(); } }); - this._submitCommand = this._dialog.querySelector(selectors.submitCommand); - this._submitButton = this._dialog.getButton(selectors.submitButton); this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha); - this._submitButton.setAttribute("command", this._submitCommand.id); this._submitButton.disabled = true; + this._dialog.addEventListener("dialogaccept", e => { + e.preventDefault(); + this.onSubmitCaptcha(); + }); this._dialogDescription = this._dialog.querySelector( selectors.dialogDescription @@ -93,30 +89,14 @@ class RequestBridgeDialog { TorStrings.settings.captchaTextboxPlaceholder ); this._captchaEntryTextbox.disabled = true; - this._captchaEntryTextbox.onkeypress = evt => { - const ENTER_KEY = 13; - if (evt.keyCode == ENTER_KEY) { - // logically same as pressing the 'submit' button of the parent dialog - this.onSubmitCaptcha(); - return false; - } - return true; - }; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { this._submitButton.disabled = this._captchaEntryTextbox.value == ""; }; - this._captchaRefreshCommand = this._dialog.querySelector( - selectors.refreshCaptchaCommand - ); this._captchaRefreshButton = this._dialog.querySelector( selectors.refreshCaptchaButton ); - this._captchaRefreshButton.setAttribute( - "command", - this._captchaRefreshCommand.id - ); this._captchaRefreshButton.disabled = true; this._incorrectCaptchaHbox = this._dialog.querySelector( @@ -183,7 +163,9 @@ class RequestBridgeDialog { this._bridges = aBridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); }) .catch(aError => { this._bridges = []; diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml index 1081194caf50..64c4507807fb 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml @@ -3,13 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-requestBridge-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="Request Bridge" - buttons="cancel,accept" - role="dialog"> - <command id="torPreferences-requestBridge-submitCommand" oncommand="requestBridgeDialog.onSubmitCaptcha();"/> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-requestBridge-dialog" + buttons="accept,cancel">  @@ -18,8 +16,9 @@ <image id="torPreferences-requestBridge-captchaImage" flex="1"/> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/> - <command id="torPreferences-requestBridge-refreshCaptchaCommand" oncommand="requestBridgeDialog.onRefreshCaptcha();"/> - <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://browser/skin/reload.svg"/> + <button id="torPreferences-requestBridge-refreshCaptchaButton" + image="chrome://browser/skin/reload.svg" + oncommand="requestBridgeDialog.onRefreshCaptcha();"/> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> @@ -32,4 +31,5 @@ let dialog = document.getElementById("torPreferences-requestBridge-dialog"); requestBridgeDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm index 70e49ac048f8..ba4b76738447 100644 --- a/browser/components/torpreferences/content/torLogDialog.jsm +++ b/browser/components/torpreferences/content/torLogDialog.jsm @@ -23,7 +23,8 @@ class TorLogDialog { _populateXUL(aDialog) { this._dialog = aDialog; - this._dialog.setAttribute("title", TorStrings.settings.torLogDialogTitle); + const dialogWin = this._dialog.parentElement; + dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle); this._logTextarea = this._dialog.querySelector( TorLogDialog.selectors.logTextarea diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml index ae0f4b294204..9c17f8132978 100644 --- a/browser/components/torpreferences/content/torLogDialog.xhtml +++ b/browser/components/torpreferences/content/torLogDialog.xhtml @@ -3,11 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-torLog-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - buttons="accept,extra1" - role="dialog"> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-torLog-dialog" + buttons="accept,extra1"> <html:textarea id="torPreferences-torDialog-textarea" multiline="true" @@ -19,4 +19,5 @@ let dialog = document.getElementById("torPreferences-torLog-dialog"); torLogDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 4e14e8b6d6bb1bb3a9a43a9ff5af1a6edcdbcc0b Merge: ee9af3088c44 76ee81e0323d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 13:21:14 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1 .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-)

1 0

[tor/release-0.4.4] v3 control: Persist ONION_CLIENT_AUTH_ADD client name
by asn＠torproject.org 20 Aug '20

20 Aug '20

commit 6e37086f85aa3e421ebc6f4d64de1cd82bcdeaa6 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Aug 6 22:32:30 2020 -0700 v3 control: Persist ONION_CLIENT_AUTH_ADD client name --- changes/ticket40089 | 4 ++++ src/feature/control/control_hs.c | 11 ++++++++++ src/feature/hs/hs_client.c | 2 ++ src/feature/hs/hs_client.h | 3 +++ src/test/test_hs_control.c | 47 +++++++++++++++++++++++++++++++++++++--- 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/changes/ticket40089 b/changes/ticket40089 new file mode 100644 index 0000000000..121e8e9820 --- /dev/null +++ b/changes/ticket40089 @@ -0,0 +1,4 @@ + o Minor features (control port): + - If a ClientName was specified in ONION_CLIENT_AUTH_ADD for an + onion service, display it when we use ONION_CLIENT_AUTH_VIEW + on it. Closes ticket 40089. Patch by Neel Chauhan. diff --git a/src/feature/control/control_hs.c b/src/feature/control/control_hs.c index c8de03b318..54b767cd0d 100644 --- a/src/feature/control/control_hs.c +++ b/src/feature/control/control_hs.c @@ -134,6 +134,13 @@ handle_control_onion_client_auth_add(control_connection_t *conn, } } SMARTLIST_FOREACH_END(flag); } + if (!strcasecmp(line->key, "ClientName")) { + if (strlen(line->value) > REND_CLIENTNAME_MAX_LEN) { + control_printf_endreply(conn, 512, "ClientName longer than %d chars", + REND_CLIENTNAME_MAX_LEN); + } + creds->client_name = tor_strdup(line->value); + } } hs_client_register_auth_status_t register_status; @@ -255,6 +262,10 @@ encode_client_auth_cred_for_control_port( } } + if (cred->client_name) { + smartlist_add_asprintf(control_line, " ClientName=%s", cred->client_name); + } + /* Join all the components into a single string */ msg_str = smartlist_join_strings(control_line, "", 0, NULL); diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index d9c5d8ca1d..fc1fd76efc 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -2168,6 +2168,8 @@ client_service_authorization_free_(hs_client_service_authorization_t *auth) return; } + tor_free(auth->client_name); + memwipe(auth, 0, sizeof(*auth)); tor_free(auth); } diff --git a/src/feature/hs/hs_client.h b/src/feature/hs/hs_client.h index a11caa309f..88dede8126 100644 --- a/src/feature/hs/hs_client.h +++ b/src/feature/hs/hs_client.h @@ -71,6 +71,9 @@ typedef struct hs_client_service_authorization_t { /** An onion address that is used to connect to the onion service. */ char onion_address[HS_SERVICE_ADDR_LEN_BASE32+1]; + /** An client name used to connect to the onion service. */ + char *client_name; + /* Optional flags for this client. */ int flags; } hs_client_service_authorization_t; diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index 1f574179e9..80bbf547dc 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -212,7 +212,8 @@ test_hs_control_good_onion_client_auth_add(void *arg) MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock); int retval; - ed25519_public_key_t service_identity_pk_2fv, service_identity_pk_jt4; + ed25519_public_key_t service_identity_pk_2fv, service_identity_pk_jt4, + service_identity_pk_jam; control_connection_t conn; char *args = NULL; char *cp1 = NULL; @@ -238,6 +239,12 @@ test_hs_control_good_onion_client_auth_add(void *arg) &service_identity_pk_jt4, NULL, NULL); tt_int_op(retval, OP_EQ, 0); + + retval = hs_parse_address( + "jamie3vkiwibfiwucd6vxijskbhpjdyajmzeor4mc4i7yopvpo4p7cyd", + &service_identity_pk_jam, + NULL, NULL); + tt_int_op(retval, OP_EQ, 0); } digest256map_t *client_auths = get_hs_client_auths_map(); @@ -264,6 +271,20 @@ test_hs_control_good_onion_client_auth_add(void *arg) retval = handle_control_command(&conn, (uint32_t) strlen(args), args); tt_int_op(retval, OP_EQ, 0); + /* Check contents */ + cp1 = buf_get_contents(TO_CONN(&conn)->outbuf, &sz); + tt_str_op(cp1, OP_EQ, "250 OK\r\n"); + tor_free(cp1); + tor_free(args); + + /* Register second service (even with an unrecognized argument) */ + args = tor_strdup("jamie3vkiwibfiwucd6vxijskbhpjdyajmzeor4mc4i7yopvpo4p7cyd " + "x25519:FCV0c0ELDKKDpSFgVIB8Yow8Evj5iD+GoiTtK878NkQ= " + "ClientName=MeganNicole "); + + retval = handle_control_command(&conn, (uint32_t) strlen(args), args); + tt_int_op(retval, OP_EQ, 0); + /* Check contents */ cp1 = buf_get_contents(TO_CONN(&conn)->outbuf, &sz); tt_str_op(cp1, OP_EQ, "250 OK\r\n"); @@ -271,7 +292,7 @@ test_hs_control_good_onion_client_auth_add(void *arg) client_auths = get_hs_client_auths_map(); tt_assert(client_auths); - tt_uint_op(digest256map_size(client_auths), OP_EQ, 2); + tt_uint_op(digest256map_size(client_auths), OP_EQ, 3); hs_client_service_authorization_t *client_2fv = digest256map_get(client_auths, service_identity_pk_2fv.pubkey); @@ -283,6 +304,11 @@ test_hs_control_good_onion_client_auth_add(void *arg) tt_assert(client_jt4); tt_int_op(client_jt4->flags, OP_EQ, 0); + hs_client_service_authorization_t *client_jam = + digest256map_get(client_auths, service_identity_pk_jam.pubkey); + tt_assert(client_jam); + tt_int_op(client_jam->flags, OP_EQ, 0); + /* Now let's VIEW the auth credentials */ tor_free(conn.current_cmd); conn.current_cmd = tor_strdup("ONION_CLIENT_AUTH_VIEW"); @@ -294,6 +320,9 @@ test_hs_control_good_onion_client_auth_add(void *arg) #define VIEW_CORRECT_REPLY_NO_ADDR "250-ONION_CLIENT_AUTH_VIEW\r\n" \ "250-CLIENT 2fvhjskjet3n5syd6yfg5lhvwcs62bojmthr35ko5bllr3iqdb4ctdyd " \ "x25519:iJ1tjKCrMAbiFT2bVrCjhbfMDnE1fpaRbIS5ZHKUvEQ=\r\n" \ + "250-CLIENT jamie3vkiwibfiwucd6vxijskbhpjdyajmzeor4mc4i7yopvpo4p7cyd " \ + "x25519:FCV0c0ELDKKDpSFgVIB8Yow8Evj5iD+GoiTtK878NkQ= " \ + "ClientName=MeganNicole\r\n" \ "250-CLIENT jt4grrjwzyz3pjkylwfau5xnjaj23vxmhskqaeyfhrfylelw4hvxcuyd " \ "x25519:eIIdIGoSZwI2Q/lSzpf92akGki5I+PZIDz37MA5BhlA=\r\n" \ "250 OK\r\n" @@ -364,7 +393,19 @@ test_hs_control_good_onion_client_auth_add(void *arg) /* Now also remove the other one */ tor_free(args); - args =tor_strdup("2fvhjskjet3n5syd6yfg5lhvwcs62bojmthr35ko5bllr3iqdb4ctdyd"); + args = + tor_strdup("2fvhjskjet3n5syd6yfg5lhvwcs62bojmthr35ko5bllr3iqdb4ctdyd"); + + retval = handle_control_command(&conn, (uint32_t) strlen(args), args); + tt_int_op(retval, OP_EQ, 0); + cp1 = buf_get_contents(TO_CONN(&conn)->outbuf, &sz); + tt_str_op(cp1, OP_EQ, "250 OK\r\n"); + tor_free(cp1); + + /* Now also remove the other one */ + tor_free(args); + args = + tor_strdup("jamie3vkiwibfiwucd6vxijskbhpjdyajmzeor4mc4i7yopvpo4p7cyd"); retval = handle_control_command(&conn, (uint32_t) strlen(args), args); tt_int_op(retval, OP_EQ, 0);

1 0

[tor/maint-0.4.4] v3 control: Persist ONION_CLIENT_AUTH_ADD client name
by asn＠torproject.org 20 Aug '20

20 Aug '20

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by asn＠torproject.org 20 Aug '20

20 Aug '20

commit ff99089d4111c90e0265a6a367942d77714233a8 Merge: c9e4ccf99b 6e37086f85 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 20 14:34:56 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40089 | 4 ++++ src/feature/control/control_hs.c | 11 ++++++++++ src/feature/hs/hs_client.c | 2 ++ src/feature/hs/hs_client.h | 3 +++ src/test/test_hs_control.c | 47 +++++++++++++++++++++++++++++++++++++--- 5 files changed, 64 insertions(+), 3 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2020