Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: describe onlynet option in doc/tor.md #15792

Merged
merged 1 commit into from Apr 15, 2019

Conversation

Projects
None yet
5 participants
@jonatack
Copy link
Contributor

commented Apr 11, 2019

as per http://www.erisian.com.au/bitcoin-core-dev/log-2019-04-11.html#l-102.

Description adapted from /src/init.cpp#L429.

Please verify if this is the best place to add it in the documentation.

This commit also fixes a typo in doc/dependencies.md.

[skip ci]

Show resolved Hide resolved doc/tor.md Outdated
Show resolved Hide resolved doc/tor.md Outdated

@fanquake fanquake added the Docs label Apr 11, 2019

@jonatack jonatack force-pushed the jonatack:add-onlynet-option-to-tor-docs branch from cdf47e8 to 140bbee Apr 11, 2019

@jonatack

This comment has been minimized.

Copy link
Contributor Author

commented Apr 11, 2019

Thanks for reviewing! Updated as per feedback.

@laanwj

This comment has been minimized.

Copy link
Member

commented Apr 11, 2019

thanks, utACK

@jonatack

This comment has been minimized.

Copy link
Contributor Author

commented Apr 11, 2019

If merged, might be worth backporting to 0.18.0 before final.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Apr 11, 2019

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #15778 ([wallet] Move maxtxfee from node to wallet by jnewbery)

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.

@jonatack

This comment has been minimized.

Copy link
Contributor Author

commented Apr 11, 2019

DrahtBot appears to be mistaken; the other PR does not change these 2 documentation files. Perhaps it is from the link to source code in the commit message or the PR description?

@practicalswift

This comment has been minimized.

Copy link
Member

commented Apr 11, 2019

ACK 140bbee

@fanquake

This comment has been minimized.

Copy link
Member

commented Apr 15, 2019

utACK 140bbee

@fanquake fanquake referenced this pull request Apr 15, 2019

Closed

trivial: fixed typo #15817

@laanwj laanwj merged commit 140bbee into bitcoin:master Apr 15, 2019

1 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Apr 15, 2019

Merge #15792: doc: describe onlynet option in doc/tor.md
140bbee doc: describe onlynet option in doc/tor.md (Jon Atack)

Pull request description:

  as per http://www.erisian.com.au/bitcoin-core-dev/log-2019-04-11.html#l-102.

  Description adapted from [/src/init.cpp#L429](https://github.com/bitcoin/bitcoin/blob/master/src/init.cpp#L429).

  Please verify if this is the best place to add it in the documentation.

  This commit also fixes a typo in doc/dependencies.md.

  [skip ci]

ACKs for commit 140bbe:
  practicalswift:
    ACK 140bbee
  fanquake:
    utACK 140bbee

Tree-SHA512: 05064cc155de5a855e26f70ac5741a137ee5050573007a19e10dba0b5b2c89148ef30f765b50fc76f73dfad17df082f4e68e174b93e2bf7e169e8bd1f9426673

@laanwj laanwj added this to the 0.18.0 milestone Apr 15, 2019

fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 15, 2019

@fanquake fanquake referenced this pull request Apr 15, 2019

Merged

[0.18] doc backports #15818

@fanquake

This comment has been minimized.

Copy link
Member

commented Apr 15, 2019

Backported in #15818.

@jonatack jonatack deleted the jonatack:add-onlynet-option-to-tor-docs branch Apr 15, 2019

fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 16, 2019

laanwj added a commit that referenced this pull request Apr 18, 2019

Merge #15818: [0.18] doc backports
a644780 doc: Clarify RPC versioning (MarcoFalke)
194226f doc: describe onlynet option in doc/tor.md (Jon Atack)
6d2448c doc/dependencies: Fix typo libsrvg->librsvg (Luke Dashjr)
9c572e3 doc: mention creating application support bitcoin folder on OSX (Jack Mallers)
c69138a gitignore: add *.plist (clang-check) (James O'Beirne)
8f7cfb0 gitignore: add *.dat (James O'Beirne)

Pull request description:

  Backports #15684, #15792, #15802,  #15809 to the `0.18` branch.

ACKs for commit a64478:

Tree-SHA512: 6ed524a7b94242f8a738710d4321b98b9e80d6625d384fd83280b38fcb6bb8c468bcec1d980789ad2f4c91a5629ffe5c5314a7353181f08884c5a081840431cc

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Apr 19, 2019

uhliksk added a commit to fxtc-development/fxtc that referenced this pull request May 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.