Move sample proxy config near top of net settings.

This commit is contained in:
Dave Collins 2013-08-07 21:49:10 -05:00
parent 3f782928fd
commit f0a0b06f29
2 changed files with 9 additions and 1 deletions

View file

@ -7,6 +7,15 @@
; Use testnet. ; Use testnet.
; testnet=1 ; testnet=1
; Connect via a SOCKS5 proxy.
; proxy=127.0.0.1:9050
; proxyuser=
; proxypass=
; The SOCKS5 proxy above is Tor (https://www.torproject.org).
; tor=1
; Add as many peers to connect to as desired. Separate each peer with a space. ; Add as many peers to connect to as desired. Separate each peer with a space.
; You may specify each IP address with or without a port. The default port will ; You may specify each IP address with or without a port. The default port will
; be added automatically if one is not specified here. ; be added automatically if one is not specified here.

View file

@ -61,7 +61,6 @@ type server struct {
// handleAddPeerMsg deals with adding new peers. It is invoked from the // handleAddPeerMsg deals with adding new peers. It is invoked from the
// peerHandler goroutine. // peerHandler goroutine.
func (s *server) handleAddPeerMsg(peers *list.List, banned map[string]time.Time, p *peer) { func (s *server) handleAddPeerMsg(peers *list.List, banned map[string]time.Time, p *peer) {
// Ignore new peers if we're shutting down. // Ignore new peers if we're shutting down.
direction := directionString(p.inbound) direction := directionString(p.inbound)
if s.shutdown { if s.shutdown {