Commit Graph

1390 Commits

Author SHA1 Message Date
Jonathan Warren
bb791afbe4 resolved merge conflict 2013-01-24 11:51:02 -05:00
Jonathan Warren
b3fa3a6fe7 conflict fix 2013-01-24 11:45:25 -05:00
Jonathan Warren
c09a9e7fd8 added some comments 2013-01-24 11:40:04 -05:00
Jonathan Warren
3df7a16540 small changes 2013-01-24 11:38:12 -05:00
Jonathan Warren
1a3cf0d74d moved pubkey POW responsibility from the receiveData thread to the singleWorker thread 2013-01-22 14:29:49 -05:00
Jonathan Warren
dffbffca45 various small changes 2013-01-22 00:21:32 -05:00
Jonathan Warren
f7f8545b97 added pyelliptic LICENSE and README.md 2013-01-20 20:33:03 -05:00
Jonathan Warren
ddd21e91bd minor changes 2013-01-20 20:17:39 -05:00
Jonathan Warren
f0626a8542 commented out two additional lines for Linux support 2013-01-20 19:12:01 -05:00
Jonathan Warren
1416430b3e added support for Linux 2013-01-20 19:00:46 -05:00
Jonathan Warren
74dc0a9a8f Most of the ECC upgrade completed 2013-01-18 17:38:09 -05:00
Jonathan Warren
59187e1937 Merge branch 'master' of github.com:Atheros1/PyBitmessage into ecc 2013-01-16 15:25:46 -05:00
Jonathan Warren
c4f82c4e2f Merge pull request #25 from Atheros1/master
added DNS-based bootstrap method
2013-01-16 10:02:22 -08:00
Jonathan Warren
bdf426b0d6 added DNS-based bootstrap method 2013-01-16 12:27:42 -05:00
Jonathan Warren
16d851410b added DNS-based bootstrap method 2013-01-16 12:27:24 -05:00
Jonathan Warren
f0666e6544 some address generation work completed 2013-01-16 11:52:52 -05:00
Jonathan Warren
f2ec2f3250 Merge pull request #24 from Atheros1/master
updated defaultKnownNodes
2013-01-14 14:56:27 -08:00
Jonathan Warren
f18eb5c91b updated defaultKnownNodes 2013-01-14 17:55:39 -05:00
Jonathan Warren
fa2bce7510 Merge pull request #23 from Atheros1/master
make version 0.1.* properly handle future version 2 addresses
2013-01-11 14:22:40 -08:00
Jonathan Warren
c9ba81f476 make version 0.1.* properly handle future version 2 addresses 2013-01-11 17:21:55 -05:00
Jonathan Warren
b125a8194a Merge pull request #22 from Atheros1/master
missed the command 'print'
2013-01-04 14:43:20 -08:00
Jonathan Warren
611ea9d511 missed the word Print 2013-01-04 17:42:24 -05:00
Jonathan Warren
fa9397f89d Merge pull request #21 from Atheros1/master
Various small changes
2013-01-04 14:37:15 -08:00
Jonathan Warren
fda4b49779 increment version number 2013-01-04 17:29:20 -05:00
Jonathan Warren
c65238d3d2 various smaller changes 2013-01-04 17:26:27 -05:00
Jonathan Warren
afccad2925 various small changes 2013-01-04 17:21:33 -05:00
Jonathan Warren
90c997e71f Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-01-04 11:20:38 -05:00
Jonathan Warren
89734e280e Merge pull request #20 from Atheros1/master
print more information when sock.recv error occurs
2012-12-27 09:28:47 -08:00
Jonathan Warren
ce6dad329d print more information when sock.recv error occurs 2012-12-27 12:26:06 -05:00
Jonathan Warren
08c3ca8485 Merge pull request #19 from Atheros1/master
Client will now accept more than one connection from the same remote IP
2012-12-27 08:47:50 -08:00
Jonathan Warren
f40e77cf86 update defaultKnownNodes 2012-12-27 11:43:57 -05:00
Jonathan Warren
086ac940c6 Client will now accept more than one connection from the same remote IP 2012-12-27 11:26:52 -05:00
Jonathan Warren
6877ca7cce update defaultKnownNodes 2012-12-22 19:41:34 -05:00
Jonathan Warren
151358566a Windows resize to fit contents on different operating systems 2012-12-21 10:55:29 -05:00
Jonathan Warren
80e0ae9d0a Merge pull request #18 from Atheros1/master
Accept addresses which lack the prepended BM-; useful for copying and pasting
2012-12-19 11:53:59 -08:00
Jonathan Warren
64fad80f44 Accept addresses which lack the prepended BM-; useful for copying and pasting 2012-12-19 14:49:40 -05:00
Jonathan Warren
7cef4958ca changed the way the client stores and sends ackData to head off theoretical attacks involving PayloadLength values that do not match the true payload length of the sent data 2012-12-19 11:51:51 -05:00
Jonathan Warren
27aa86e741 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2012-12-19 10:38:54 -05:00
Jonathan Warren
85845ff7a8 made statements printed to screen shorter 2012-12-19 10:38:45 -05:00
Jonathan Warren
69ff3bb904 Merge pull request #17 from Atheros1/master
Set socket timeout to 20 seconds to give Tor more time to connect
2012-12-18 22:24:13 -08:00
Jonathan Warren
ab31fb69aa set socket timeout to 20 seconds to give Tor more time to connect 2012-12-19 01:22:04 -05:00
Jonathan Warren
e02725e9bd Merge pull request #16 from Atheros1/master
Added support for SOCKS proxies
2012-12-18 13:52:44 -08:00
Jonathan Warren
7a98317439 merged SOCKS branch 2012-12-18 16:44:04 -05:00
Jonathan Warren
6586bd2d6d further refined SOCKS exception messages 2012-12-18 16:36:37 -05:00
Jonathan Warren
1fdb21693d minor change to UI 2012-12-18 14:37:37 -05:00
Jonathan Warren
7c69c93f82 SOCKS 2012-12-18 13:32:48 -05:00
Jonathan Warren
33cb1a621a added can-icon.ico 2012-12-18 13:12:09 -05:00
Jonathan Warren
3411f8f39a added SOCKS 2012-12-18 13:09:10 -05:00
Jonathan Warren
9e62cd4676 Merge pull request #15 from Atheros1/master
updated defaultKnownNodes
2012-12-17 22:45:34 -08:00
Jonathan Warren
a4d651a68d updated defaultKnownNodes 2012-12-18 01:41:57 -05:00