[tor-commits] [chutney/master] Tidy common.i, and reorder options for readability

[teor at torproject.org]

commit 19a217c3a476bd04c1d35201251a705a47247876
Author: teor <teor2345 at gmail.com>
Date:   Wed Feb 15 14:00:47 2017 +1100

    Tidy common.i, and reorder options for readability
    
    No behaviour change
---
 torrc_templates/common.i | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 508c4ac..bca0407 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -37,17 +37,19 @@ RunAsDaemon 1
 ConnLimit $connlimit
 Nickname $nick
 ShutdownWaitLength 0
+DisableDebuggerAttachment 0
+
+ControlPort $controlport
+# Use ControlSocket rather than ControlPort unix: to support older tors
+ControlSocket ${dir}/control
+CookieAuthentication 1
 PidFile ${dir}/pid
+
 Log notice file ${dir}/notice.log
 Log info file ${dir}/info.log
 # Turn this off to save space
 #Log debug file ${dir}/debug.log
 ProtocolWarnings 1
 SafeLogging 0
-DisableDebuggerAttachment 0
-${authorities}
 
-ControlPort $controlport
-# Use ControlSocket rather than ControlPort unix: to support older tors
-ControlSocket ${dir}/control
-CookieAuthentication 1
+${authorities}