Replace `hidden service` with `onion service`

RiccardoMasutti commented at 1:19 pm on August 1, 2020: contributor

For a couple of years, Tor has made the term hidden service obsolete, in favor of onion service: Tor Project | Onion Services

This PR updates all the references.

DrahtBot added the label Docs on Aug 1, 2020

DrahtBot added the label GUI on Aug 1, 2020

DrahtBot added the label P2P on Aug 1, 2020

hebasto commented at 3:27 pm on August 1, 2020: member

Could it be done with a scripted diff?

jonatack commented at 3:48 pm on August 1, 2020: member

Beyond the question of whether this is a change worth making and worth the review time it is requesting, it looks like this PR is a drive-by search and replace that touches a number of files that are auto-generated or not usually changed.

DrahtBot commented at 3:49 pm on August 1, 2020: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#19485 (torcontrol: Create also a V3 ed25519-V3 onion address. by Saibato)
#19358 (net: Make sure we do not override proxy settings in hidden service. by Saibato)
#19288 (tests: Add fuzzing harness for TorController by practicalswift)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Saibato commented at 5:35 pm on August 1, 2020: contributor

thx @RiccardoMasutti , for pointing this out and I somewhat like this kind of compliance on paper since disguise is the sister of hidden,

tor source code; ./src/feature/rend/rendservice.h:

0  /* Other fields */
1  crypto_pk_t *private_key; /**< Permanent hidden-service key. */
2  char service_id[REND_SERVICE_ID_LEN_BASE32+1]; /**< Onion address without
3                                                  * '.onion' */
4  char pk_digest[DIGEST_LEN]; /**< Hash of permanent hidden-service key. */
5  smartlist_t *intro_nodes; /**< List of rend_intro_point_t's we have,
6                             * or are trying to establish. */
7  /** List of rend_intro_point_t that are expiring. They are removed once
8   * the new descriptor is successfully uploaded. A node in this list CAN
9   * NOT appear in the intro_nodes list. */

names it, what it should be ?

So imho facts become not that different by wording. But as this is kind of compliance on paper and disguise the sister of hidden, I somewhat like it.

The moment even HiddenServiceDir parameter for use in torrc get renamed we should act.

in src/qt/locale/bitcoin_en.ts:1438 in e9e54ec2d7 outdated

1437@@ -1438,7 +1438,7 @@
1438     </message>

laanwj commented at 11:02 am on August 2, 2020:

Please do not make manual changes to this file. It’s automatically updated with translation updates.

in doc/release-notes/release-notes-0.14.0.md:689 in e9e54ec2d7 outdated

688@@ -689,7 +689,7 @@ and git merge commit are mentioned.
689 - #8567 `85d4e21` Add default port numbers to REST doc (djpnewton)

laanwj commented at 11:03 am on August 2, 2020:

Please don’t touch historical release notes.

laanwj commented at 11:04 am on August 2, 2020: member

Concept ACK. I think ‘onion service’ describes more concretely than ‘hidden service’ what is being talked about.

it looks like this PR is a drive-by search and replace that touches a number of files that are auto-generated or not usually changed.

Yes.

And please squash this into one commit when done.

in doc/man/bitcoin-qt.1:196 in e9e54ec2d7 outdated

192@@ -193,7 +193,7 @@ Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\
193 .HP
194 \fB\-listenonion\fR
195 .IP
196-Automatically create Tor hidden service (default: 1)
197+Automatically create Tor onion service (default: 1)

jonatack commented at 11:22 am on August 2, 2020:

The first line of each of the man files states: DO NOT MODIFY THIS FILE! It was generated by...

fanquake added the label Waiting for author on Aug 3, 2020

practicalswift commented at 3:52 pm on August 3, 2020: contributor

Concept ACK assuming @laanwj’s feedback is addressed

Welcome as a contributor @RiccardoMasutti! :)

fanquake commented at 0:39 am on August 4, 2020: member

You need to squash your changes into a single commit, and use a proper commit message. i.e:

0doc: replace hidden service with onion service
1
2For a couple of years, Tor documentation has made 
3the term hidden service obsolete, in favor of onion 
4service.
5
6This PR updates all the references in the code base.

RiccardoMasutti force-pushed on Aug 4, 2020

RiccardoMasutti commented at 11:29 am on August 4, 2020: contributor

@fanquake @laanwj It should be okay now. Can you review it again please?

Ps: it’s my first time squashing commits via git, and I’m really happy to have learned it. Usually I relied on GitHub repo maintainers who have the ability to squash and merge

in doc/tor.md:113 in 6beb0d3f36 outdated

109@@ -110,7 +110,7 @@ Connecting to Tor's control socket API requires one of two authentication method
110 configured. It also requires the control socket to be enabled, e.g. put `ControlPort 9051`
111 in `torrc` config file. For cookie authentication the user running bitcoind must have read
112 access to the `CookieAuthFile` specified in Tor configuration. In some cases this is
113-preconfigured and the creation of a hidden service is automatic. If permission problems
114+preconfigured and the creation of a onion service is automatic. If permission problems

jonatack commented at 11:47 am on August 4, 2020:

s/a onion/an onion/ here and also lines 22 and 101

RiccardoMasutti force-pushed on Aug 4, 2020

RiccardoMasutti requested review from laanwj on Aug 4, 2020

RiccardoMasutti requested review from jonatack on Aug 4, 2020

practicalswift commented at 12:56 pm on August 4, 2020: contributor

ACK f2cd7a4dc93ac117438887cabe6dd095ecf611aa – patch looks correct

fanquake removed the label Waiting for author on Aug 6, 2020

hebasto changes_requested

hebasto commented at 3:47 am on August 6, 2020: member

Please change here: https://github.com/bitcoin/bitcoin/blob/19f812c57b420ae3e9ab5a95335e2adb5f54faf0/src/qt/forms/optionsdialog.ui#L460-L467

laanwj commented at 4:37 pm on August 6, 2020: member

Welcome as a contributor @RiccardoMasutti! :)

Yes and thanks for sticking with this, most admit that it’s not really documented anywhere which files you are and are not allowed to change.

Replace `hidden service` with `onion service`

For a couple of years, Tor documentation has made
the term hidden service obsolete, in favor of onion
service.

This PR updates all the references in the code base.

1e72b68ab3

RiccardoMasutti force-pushed on Aug 7, 2020

RiccardoMasutti requested review from hebasto on Aug 7, 2020

RiccardoMasutti commented at 1:02 pm on August 7, 2020: contributor

@laanwj ready to merge

hebasto approved

hebasto commented at 4:51 pm on August 7, 2020: member

ACK 1e72b68ab330c72644981508c8a1b3fa670d086f, tested on Linux Mint 20 (x86_64).

The GUI-related changes:

master:
this PR:

laanwj commented at 1:02 pm on August 9, 2020: member

Code review ACK 1e72b68ab330c72644981508c8a1b3fa670d086f

laanwj merged this on Aug 9, 2020

laanwj closed this on Aug 9, 2020

sidhujag referenced this in commit cb7ae5edea on Aug 9, 2020

laanwj referenced this in commit b76abae387 on Dec 10, 2020

barton2526 referenced this in commit eef7b0d7ac on Jun 23, 2021

Fabcien referenced this in commit 636042be37 on Sep 7, 2021

DrahtBot locked this on Aug 16, 2022

Replace hidden service with onion service #19638

Conflicts

Replace `hidden service` with `onion service` #19638