Commit 0e137e41 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

APPort is now SocksPort 


svn:r644
parent 069227db

doc/FAQ

+1 −2
Changes for doc/FAQ: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -48,9 +48,8 @@ for you.] 


The same executable ("or") functions as both client and server, depending

on which ports are specified in the configuration file. You can specify:

* APPort: client applications (eg privoxy, Mozilla) can speak socks to

* SocksPort: client applications (eg privoxy, Mozilla) can speak socks to

  this port.

* OPPort: onion proxies (client onion routers) connect to this port.

* ORPort: other onion routers connect to this port

* DirPort: onion proxies and onion routers speak http to this port, to

  pull down a directory of which nodes are currently available.

doc/tor-spec.txt

+2 −2
Changes for doc/tor-spec.txt: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ which reveals the downstream node. 
(Unless otherwise noted, tokens on the same line are space-separated.)



Router ::= Router-Line  Date-Line Onion-Key Link-Key Signing-Key  Exit-Policy Router-Signature NL

Router-Line ::= "router" nickname address ORPort APPort DirPort bandwidth NL

Router-Line ::= "router" nickname address ORPort SocksPort DirPort bandwidth NL

Date-Line ::= "published" YYYY-MM-DD HH:MM:SS NL

Onion-key ::= "onion-key"  NL  a public key in PEM format   NL

Link-key ::= "link-key"  NL  a public key in PEM format  NL
@@ -454,7 +454,7 @@ Signature ::= "-----BEGIN SIGNATURE-----" NL 
              Base-64-encoded-signature NL "-----END SIGNATURE-----" NL



ORport ::= port where the router listens for routers/proxies (speaking cells)

APPort ::=  where the router listens for applications (speaking socks)

SocksPort ::=  where the router listens for applications (speaking socks)

DirPort ::= where the router listens for directory download requests

bandwidth ::= maximum bandwidth, in bytes/s

src/config/moria1-orrc

+0 −1
Changes for src/config/moria1-orrc: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ DataDirectory moria1 
Nickname moria1



ORPort 9001

APPort 9021

DirPort 9031



OnionRouter 1

src/config/moria2-orrc

+0 −1
Changes for src/config/moria2-orrc: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ DataDirectory moria2 
Nickname moria2



ORPort 9002

APPort 9022

DirPort 9032



OnionRouter 1

src/config/moria3-orrc

+0 −1
Changes for src/config/moria3-orrc: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ DataDirectory moria3 
Nickname moria3



ORPort 9003

APPort 9023

DirPort 9033



OnionRouter 1