Commit Graph

16997 Commits

Author SHA1 Message Date
jl777
fb3715334a Test 2017-03-26 19:25:18 +03:00
jl777
17914f3e59 Test 2017-03-26 19:15:56 +03:00
jl777
d80c066d4b Merge pull request #395 from jl777/dev
Dev
2017-03-26 19:10:35 +03:00
jl777
ddf7c583aa Test 2017-03-26 19:03:11 +03:00
jl777
1ce44fb757 Test 2017-03-26 19:01:39 +03:00
jl777
82c67a009a April 5th 2017-03-26 18:56:51 +03:00
jl777
8cfe68a169 Revert "Test"
This reverts commit ddbc321c54.
2017-03-26 18:55:51 +03:00
jl777
c8a6759c48 Merge pull request #394 from jl777/dev
Test
2017-03-26 18:55:39 +03:00
jl777
c95550ebe5 Test 2017-03-26 18:54:52 +03:00
jl777
ddbc321c54 Test 2017-03-26 18:53:42 +03:00
jl777
0ebebba0e3 Merge pull request #392 from jl777/dev
April 5th activation of interest calc fix, along with more notarization getinfo data
2017-03-26 18:42:34 +03:00
jl777
57dd4adae0 Test 2017-03-26 17:50:05 +03:00
jl777
198571952b Test 2017-03-26 17:42:34 +03:00
jl777
70d8393432 Test 2017-03-26 17:36:57 +03:00
jl777
66c5b6ae4d Test 2017-03-26 17:31:57 +03:00
jl777
7ea5a37187 Test 2017-03-26 17:22:49 +03:00
jl777
715bda82cf Test 2017-03-26 17:18:20 +03:00
jl777
c99dd13cb6 Merge pull request #391 from jl777/dev
April 5th activation
Interest calc fix for small utxo
2017-03-26 17:08:30 +03:00
jl777
ea3666c630 April 5th activation 2017-03-26 17:07:28 +03:00
jl777
73de636086 Test 2017-03-26 17:01:32 +03:00
jl777
9eb7ea3abd Test 2017-03-26 16:56:20 +03:00
jl777
cf99cfc1eb Test 2017-03-26 16:32:59 +03:00
jl777
3a7753af9c Test 2017-03-26 16:26:44 +03:00
jl777
2af45c1f38 Test 2017-03-26 16:21:30 +03:00
jl777
d8e548cb97 Test 2017-03-26 16:09:32 +03:00
jl777
f592eadc01 Test 2017-03-26 15:59:27 +03:00
jl777
170bc39eb1 Test 2017-03-26 15:44:12 +03:00
jl777
e89758bde2 Test 2017-03-26 15:39:47 +03:00
jl777
ab97f718e5 Test 2017-03-26 15:31:36 +03:00
jl777
e0f32abae5 Test 2017-03-26 15:23:39 +03:00
jl777
40f7f7e7f8 Test 2017-03-26 15:16:27 +03:00
jl777
0036398537 Test 2017-03-26 14:55:44 +03:00
jl777
0cb025c181 Test 2017-03-26 14:26:03 +03:00
jl777
e9c40f1f8f Test 2017-03-26 14:20:04 +03:00
jl777
094b401e3d Test 2017-03-26 14:16:03 +03:00
jl777
43cc3df657 Test 2017-03-26 13:53:22 +03:00
jl777
978ca79512 Test 2017-03-26 13:46:07 +03:00
jl777
033f496dbe Test 2017-03-26 13:41:31 +03:00
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