Skip to content

/ bitcoin

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

tests: Disable Tor interaction #7170

Merged
merged 1 commit into from Dec 5, 2015
Merged

tests: Disable Tor interaction #7170

merged 1 commit into from Dec 5, 2015

Conversation

@laanwj
Copy link
Member

laanwj commented Dec 4, 2015

This is unnecessary during the current tests (any test for Tor interaction can explicitly enable it) and interferes with the proxy test.
@laanwj
tests: Disable Tor interaction
Loading status checks…
4c40ec0 
This is unnecessary during the current tests (any test for Tor
interaction can explicitly enable it) and interferes with the proxy
test.
@jonasschnelli
Copy link
Member

jonasschnelli commented Dec 4, 2015

ACK
@MarcoFalke
Copy link
Member

MarcoFalke commented Dec 4, 2015

Concept ACK
@petertodd
Copy link
Contributor

petertodd commented Dec 5, 2015

utACK
1 similar comment
@GIJensen
Copy link

GIJensen commented Dec 5, 2015

utACK
@paveljanik
Copy link
Contributor

paveljanik commented Dec 5, 2015

ACK
@laanwj laanwj merged commit 4c40ec0 into bitcoin:master Dec 5, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Dec 5, 2015
@laanwj
Merge pull request #7170
Verified
This commit was signed with a verified signature.
laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
Loading status checks…
a2822b9 
4c40ec0 tests: Disable Tor interaction (Wladimir J. van der Laan)
laanwj added a commit that referenced this pull request Dec 22, 2015
@laanwj
tests: Disable Tor interaction
Verified
This commit was signed with a verified signature.
laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
Loading status checks…
453c567 
This is unnecessary during the current tests (any test for Tor
interaction can explicitly enable it) and interferes with the proxy
test.

Github-Pull: #7170
Rebased-From: 4c40ec0
@laanwj
Copy link
Member Author

laanwj commented Feb 4, 2016

This is cherry-picked to 0.12 as 453c567
@str4d str4d mentioned this pull request Mar 24, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Mar 26, 2017
@zkbot
Auto merge of #2177 - str4d:2061-tor-ephemeral-hs, r=daira
45faa92 
Tor ephemeral hidden services

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6503 (included to reduce merge conflicts)
- bitcoin/bitcoin#6639
- bitcoin/bitcoin#6643
- bitcoin/bitcoin#7090
- bitcoin/bitcoin#7035
- bitcoin/bitcoin#7170
- bitcoin/bitcoin#7218 (non-QT part)
- bitcoin/bitcoin#7313
- bitcoin/bitcoin#7438
- bitcoin/bitcoin#7553
- bitcoin/bitcoin#7637
- bitcoin/bitcoin#7683
- bitcoin/bitcoin#7813
- bitcoin/bitcoin#7703
- bitcoin/bitcoin#8203
- bitcoin/bitcoin#9004
- bitcoin/bitcoin#9234
- bitcoin/bitcoin#9911 (partial)

Closes #2061.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Tests
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@laanwj @jonasschnelli @MarcoFalke @petertodd @GIJensen @paveljanik
You can’t perform that action at this time.