/bitcoin

tests: Disable Tor interaction #7170

Merged
merged 1 commit into from Dec 5, 2015
+1 −0

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Projects
None yet
Milestone
No milestone
6 participants
@laanwj @jonasschnelli @MarcoFalke @petertodd @GIJensen @paveljanik
@laanwj
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 
This is unnecessary during the current tests (any test for Tor
interaction can explicitly enable it) and interferes with the proxy
test.
4c40ec0

@laanwj laanwj added Tests Needs backport labels Dec 4, 2015

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Dec 4, 2015

Member

ACK
Member

jonasschnelli commented Dec 4, 2015

ACK
@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Dec 4, 2015

Member

Concept ACK
Member

MarcoFalke commented Dec 4, 2015

Concept ACK
@petertodd

This comment has been minimized.

Show comment
Hide comment
@petertodd

petertodd Dec 5, 2015

Contributor

utACK
Contributor

petertodd commented Dec 5, 2015

utACK
@GIJensen

This comment has been minimized.

Show comment
Hide comment
@GIJensen

GIJensen Dec 5, 2015

utACK

GIJensen commented Dec 5, 2015

utACK
@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Dec 5, 2015

Contributor

ACK
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 
4c40ec0 tests: Disable Tor interaction (Wladimir J. van der Laan)
Verified
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
a2822b9

laanwj added a commit that referenced this pull request Dec 22, 2015

@laanwj
tests: Disable Tor interaction 
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
Verified
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
453c567

@laanwj laanwj removed the Needs backport label Feb 4, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 4, 2016

Member

This is cherry-picked to 0.12 as 453c567
Member

laanwj commented Feb 4, 2016

This is cherry-picked to 0.12 as 453c567

@str4d str4d referenced this pull request in zcash/zcash Mar 24, 2017

Merged

Tor ephemeral hidden services #2177

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 
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.
45faa92
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment