5 files changed, 2 insertions, 5 deletions
diff --git a/src/config/moria1-orrc b/src/config/moria1-orrc
index b4a88c690..8ba5ad45a 100644
--- a/src/config/moria1-orrc
+++ b/src/config/moria1-orrc
@@ -3,7 +3,6 @@ DataDirectory moria1
 Nickname moria1
 
 ORPort 9001
-APPort 9021
 DirPort 9031
 
 OnionRouter 1
diff --git a/src/config/moria2-orrc b/src/config/moria2-orrc
index 33353d56d..aa956c0a1 100644
--- a/src/config/moria2-orrc
+++ b/src/config/moria2-orrc
@@ -3,7 +3,6 @@ DataDirectory moria2
 Nickname moria2
 
 ORPort 9002
-APPort 9022
 DirPort 9032
 
 OnionRouter 1
diff --git a/src/config/moria3-orrc b/src/config/moria3-orrc
index d1e34d6e7..3610cd28a 100644
--- a/src/config/moria3-orrc
+++ b/src/config/moria3-orrc
@@ -3,7 +3,6 @@ DataDirectory moria3
 Nickname moria3
 
 ORPort 9003
-APPort 9023
 DirPort 9033
 
 OnionRouter 1
diff --git a/src/config/sample-server-torrc.in b/src/config/sample-server-torrc.in
index a53058989..59a88460a 100644
--- a/src/config/sample-server-torrc.in
+++ b/src/config/sample-server-torrc.in
@@ -10,7 +10,7 @@ Address moria.seul.org
 # Ports for various services. Comment out or set to 0 if you're not
 # offering that service.
 ORPort 9004 # listening for cell-speaking connections
-APPort 9024 # listening for socks-speaking connections
+SocksPort 9024 # listening for socks-speaking connections
 #DirPort 0
 
 # Leave this set, or we'll be treated like a client.
diff --git a/src/config/torrc.in b/src/config/torrc.in
index 361840e4e..1208a3624 100644
--- a/src/config/torrc.in
+++ b/src/config/torrc.in
@@ -8,5 +8,5 @@ RouterFile @CONFDIR@/dirservers
 # Ports for various services. Comment out if you're not running that
 # service.
 #ORPort 9001
-APPort 9050
+SocksPort 9050