Skip to content

Conversation

RiccardoMasutti
Copy link
Contributor

@RiccardoMasutti RiccardoMasutti commented Aug 1, 2020

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.

@hebasto
Copy link
Member

hebasto commented Aug 1, 2020

Could it be done with a scripted diff?

@jonatack
Copy link
Member

jonatack commented Aug 1, 2020

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
Copy link
Contributor

DrahtBot commented Aug 1, 2020

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

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
Copy link
Contributor

Saibato commented Aug 1, 2020

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:

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

@@ -1438,7 +1438,7 @@
</message>
Copy link
Member

@laanwj laanwj Aug 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't touch historical release notes.

@laanwj
Copy link
Member

laanwj commented Aug 2, 2020

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.

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@practicalswift
Copy link
Contributor

Concept ACK assuming @laanwj's feedback is addressed

Welcome as a contributor @RiccardoMasutti! :)

@fanquake
Copy link
Member

fanquake commented Aug 4, 2020

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

doc: 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.

@RiccardoMasutti
Copy link
Contributor Author

RiccardoMasutti commented Aug 4, 2020

@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

@practicalswift
Copy link
Contributor

ACK f2cd7a4 -- patch looks correct

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change here:

<widget class="QCheckBox" name="connectSocksTor">
<property name="toolTip">
<string>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</string>
</property>
<property name="text">
<string>Use separate SOCKS&amp;5 proxy to reach peers via Tor hidden services:</string>
</property>
</widget>

@laanwj
Copy link
Member

laanwj commented Aug 6, 2020

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.

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.
@RiccardoMasutti
Copy link
Contributor Author

@laanwj ready to merge

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

The GUI-related changes:

  • master:
    DeepinScreenshot_select-area_20200807194930
  • this PR:
    DeepinScreenshot_select-area_20200807194725

@laanwj
Copy link
Member

laanwj commented Aug 9, 2020

Code review ACK 1e72b68

@laanwj laanwj merged commit 6ea7348 into bitcoin:master Aug 9, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Aug 9, 2020
1e72b68 Replace `hidden service` with `onion service` (Riccardo Masutti)

Pull request description:

  For a couple of years, Tor has made the term `hidden service` obsolete, in favor of `onion service`: [Tor Project | Onion Services](https://community.torproject.org/onion-services/)

  This PR updates all the references.

ACKs for top commit:
  laanwj:
    Code review ACK 1e72b68
  hebasto:
    ACK 1e72b68, tested on Linux Mint 20 (x86_64).

Tree-SHA512: 6a29e828e1c5e1ec934b5666f67326dbd84d77c8b2641f6740abac6d3d5923b7729763b9ff2230390b0bb23359a5f3731ccd9a30011ca69004f7c820aed17262
@ghost ghost mentioned this pull request Dec 7, 2020
laanwj added a commit to bitcoin-core/gui that referenced this pull request Dec 10, 2020
32045bb [doc] Tidy up Tor doc (more stringent) (wodry)

Pull request description:

  This is a follow up to bitcoin/bitcoin#19638 that left two deprecated "hidden service/server" naming occurences.

  It also shall make the chapter titles regarding creation of onion services stringent and easy to read and distinguish.

  It removes the one and only reference to the testnet (here the testnet onion service port), as it is not explained that it references to the testnet and I do not know why it is mentioned there. It is only confusing. Also, as said, the testnet is not referenced at any other place in this document.

ACKs for top commit:
  practicalswift:
    ACK 32045bb
  laanwj:
    Review ACK 32045bb
  RiccardoMasutti:
    ACK 32045bb

Tree-SHA512: c623387b76d68845c0fa47f67a6f8ef70c9c560e3f8f8754e45a4f51e43198c2092be789588acd4ada607f42fbe62d51a4b1888d81b225df19b6557a081835c0
barton2526 added a commit to barton2526/Gridcoin-Research that referenced this pull request Jun 23, 2021
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Sep 7, 2021
Summary:
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.

This is a backport of [[bitcoin/bitcoin#19638 | core#19638]]

Test Plan: proof-reading

Reviewers: #bitcoin_abc, majcosta

Reviewed By: #bitcoin_abc, majcosta

Differential Revision: https://reviews.bitcoinabc.org/D10062
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants