Commit Graph

14554 Commits

Author SHA1 Message Date
jl777
1e2a41f6c1 Test 2017-03-26 13:35:37 +03:00
jl777
9e1bde7e24 Test 2017-03-26 13:30:23 +03:00
jl777
f1024f06ac Test 2017-03-26 13:25:55 +03:00
jl777
7ed958da81 Test 2017-03-26 13:20:00 +03:00
jl777
5de55e14aa Test 2017-03-26 13:10:23 +03:00
jl777
b000fa04a6 Test 2017-03-26 12:53:24 +03:00
zkbot
45faa928ec 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.
2017-03-26 02:44:06 +00:00
zkbot
f7fcad709b Auto merge of #2203 - arcalinea:2142_security_log_message, r=daira
Add message directing users to security guide

Addresses #2142, which was blocking on updates to zcash/support/security.html. That page has now been added, so this message directing users to the site can be included.

It displays in the zcash-cli --help and --version message text, and on the zcashd metrics screen.
2017-03-26 01:36:24 +00:00
Jack Grigg
87b7f4d878 torcontrol: Log invalid parameters in Tor reply strings where meaningful 2017-03-26 14:35:13 +13:00
Daira Hopwood
f0d1accb7d Line-wrap privacy notice. Use <> around URL and end sentence with '.'.
Include privacy notice in help text for zcashd -help.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-03-26 02:08:29 +01:00
Jack Grigg
3290567bbd torcontrol: Check for reading errors in ReadBinaryFile
This ensures that ReadBinaryFile never returns exactly TOR_COOKIE_SIZE bytes if
the file was larger than that.
2017-03-26 13:53:13 +13:00
ca333
786af7cd31 Merge pull request #7 from jl777/master
master update
2017-03-25 22:18:43 +01:00
jl777
83f1c673bf Test 2017-03-25 23:05:17 +02:00
jl777
554cdd83b3 Merge pull request #388 from jl777/dev
Test
2017-03-25 20:37:13 +02:00
jl777
23bf71d1f6 Test 2017-03-25 20:36:39 +02:00
jl777
e84c90f704 Merge pull request #387 from jl777/dev
Remove prints
2017-03-25 19:32:57 +02:00
jl777
66294e69b2 Remove prints 2017-03-25 19:32:17 +02:00
jl777
e1fa9a2439 Merge pull request #386 from jl777/dPoW
DPoW
2017-03-25 19:08:42 +02:00
jl777
d074d6e14f Merge pull request #385 from jl777/beta
Beta
2017-03-25 19:07:55 +02:00
jl777
f8bb37565b Merge pull request #384 from jl777/dev
Dev
2017-03-25 19:07:14 +02:00
jl777
67478d4a4c Test 2017-03-25 19:06:21 +02:00
jl777
1812efacf4 Test 2017-03-25 18:50:05 +02:00
jl777
b020e6a38e Test 2017-03-25 18:49:16 +02:00
jl777
1a9890f534 Test 2017-03-25 18:49:00 +02:00
jl777
dd98c02d47 test 2017-03-25 18:46:14 +02:00
jl777
a85440acf8 Test 2017-03-25 18:32:22 +02:00
jl777
8b51b9e489 Test 2017-03-25 18:31:20 +02:00
jl777
ca3bf7ed8f Test 2017-03-25 18:30:12 +02:00
jl777
f0100e72e6 Test 2017-03-25 18:29:49 +02:00
jl777
4ab9dbe9b2 Test 2017-03-25 18:19:05 +02:00
jl777
902ac92da3 Test 2017-03-25 18:14:15 +02:00
jl777
2eb6b74a26 Test 2017-03-25 18:09:52 +02:00
jl777
37f823fba7 Test 2017-03-25 18:01:19 +02:00
jl777
0bba91a407 Test 2017-03-25 17:59:24 +02:00
jl777
c49a34c04a Test 2017-03-25 17:58:53 +02:00
jl777
44cc3bc7e6 Test 2017-03-25 17:57:28 +02:00
jl777
2e8e57576e Test 2017-03-25 17:55:07 +02:00
jl777
de65ff9543 Test 2017-03-25 17:51:17 +02:00
jl777
73326d0273 Test 2017-03-25 17:50:58 +02:00
jl777
1c5a00ced9 Test 2017-03-25 17:44:01 +02:00
jl777
9e7efae331 Merge pull request #383 from jl777/dPoW
DPoW
2017-03-25 17:11:39 +02:00
jl777
276420b373 Merge pull request #382 from jl777/beta
Beta
2017-03-25 17:10:57 +02:00
Jack Grigg
64101d0407 torcontrol: Fix ParseTorReplyMapping
- Ignore remaining input if it is an OptArguments
- Correctly handle escapes
2017-03-26 00:35:13 +13:00
Jack Grigg
6dbd95afa1 torcontrol: Add unit tests for Tor reply parsers 2017-03-26 00:34:53 +13:00
jl777
1265e49f96 Merge pull request #379 from jl777/dev
Expand time window
2017-03-25 13:26:06 +02:00
jl777
39d28b0641 Expand time window 2017-03-25 13:25:37 +02:00
jl777
9094724ab8 Merge pull request #378 from jl777/dev
Fix miner
2017-03-25 10:36:25 +02:00
jl777
0af2786dc4 Fix miner 2017-03-25 10:35:45 +02:00
jl777
1aff66e126 Merge pull request #377 from jl777/dev
Test
2017-03-25 10:28:59 +02:00
jl777
abdf25c80c Test 2017-03-25 10:28:21 +02:00