Rename -tor to -onion to better reflect what it does. #2981

pull gmaxwell wants to merge 1 commits into bitcoin:master from gmaxwell:tor2onion changing 2 files +14 −9

gmaxwell commented at 11:57 AM on September 8, 2013: contributor

I've seen users confused multiple times thinking they should be using -tor to set their tor proxy and then finding in horror that they were still connecting to the IPv4 internet.

Even Jeff guesses wrong about what the knob does, so I think we should rename it. This leaves the old knob working, we can pull it out completely in a later release.

Rename -tor to -onion to better reflect what it does.

I've seen users confused multiple times thinking they
 should be using -tor to set their tor proxy and then
 finding in horror that they were still connecting to
 the IPv4 internet.

Even Jeff guesses wrong about what the knob does, so
 I think we should rename it. This leaves the old
 knob working, we can pull it out completely in a
 later release.

102518fdb7

gmaxwell commented at 12:31 PM on September 8, 2013: contributor

Limited testing on IRC indicates that -onion may be misunderstood as enabling accepting hidden service connections. This is strictly less dangerous than the current misunderstanding, but perhaps some other flag would be better. Pieter suggested -onionproxy but I'm hesitant due to proxy perhaps getting people's attention.
gavinandresen commented at 12:19 AM on September 9, 2013: contributor

Logic would be cleaner if you use util.h SoftSetArg; e.g.

if (mapArgs.count("-tor")) SoftSetArg("-onion", mapArgs["-tor"]);
BitcoinPullTester commented at 12:22 AM on September 9, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/102518fdb711b646dec8f0cc26fa170364bf2e0b for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj commented at 11:26 AM on September 9, 2013: member

I agree with renaming it
gavinandresen referenced this in commit a5bba245a3 on Oct 17, 2013
gavinandresen merged this on Oct 17, 2013
gavinandresen closed this on Oct 17, 2013

in src/init.cpp:None in 102518fdb7

 636 | @@ -637,15 +637,20 @@ bool AppInit2(boost::thread_group& threadGroup)
 637 |          fProxy = true;
 638 |      }
 639 |  
 640 | -    // -tor can override normal proxy, -notor disables tor entirely
 641 | -    if (!(mapArgs.count("-tor") && mapArgs["-tor"] == "0") && (fProxy || mapArgs.count("-tor"))) {
 642 | +    // -onion can override normal proxy, -noonion disables tor entirely
 643 | +    // -tor here is a temporary backwards compatibility measure
 644 | +    if (mapArgs.count("-tor"))
 645 | +        printf("Notice: option -tor has been replaced with -onion and will be removed in a later version.\n");

sipa commented at 1:23 PM on October 19, 2013:

This will need to become a LogPrintf.

Bushstar referenced this in commit d63202bdce on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors