refactor: Alphabetise some includes in /src/or/*.

src/or/addressmap.c

@@ -23,8 +23,8 @@
 #include "control.h"
 #include "crypto_rand.h"
 #include "dns.h"
-#include "routerset.h"
 #include "nodelist.h"
+#include "routerset.h"
 
 /** A client-side struct to remember requests to rewrite addresses
  * to new addresses. These structs are stored in the hash table

src/or/ext_orport.c

@@ -20,11 +20,11 @@
 #include "or.h"
 #include "connection.h"
 #include "connection_or.h"
-#include "ext_orport.h"
 #include "control.h"
 #include "config.h"
 #include "crypto_rand.h"
 #include "crypto_util.h"
+#include "ext_orport.h"
 #include "main.h"
 #include "proto_ext_or.h"
 #include "util.h"

src/or/hs_client.c

@@ -9,31 +9,31 @@
 #define HS_CLIENT_PRIVATE
 
 #include "or.h"
-#include "hs_circuit.h"
-#include "hs_ident.h"
+#include "circpathbias.h"
+#include "circuitbuild.h"
+#include "circuitlist.h"
+#include "circuituse.h"
+#include "config.h"
+#include "connection.h"
 #include "connection_edge.h"
 #include "container.h"
 #include "crypto_rand.h"
 #include "crypto_util.h"
-#include "rendclient.h"
-#include "hs_descriptor.h"
+#include "directory.h"
 #include "hs_cache.h"
 #include "hs_cell.h"
-#include "config.h"
-#include "directory.h"
+#include "hs_circuit.h"
 #include "hs_client.h"
 #include "hs_control.h"
+#include "hs_descriptor.h"
+#include "hs_ident.h"
+#include "hs_ntor.h"
+#include "networkstatus.h"
+#include "nodelist.h"
+#include "reasons.h"
+#include "rendclient.h"
 #include "router.h"
 #include "routerset.h"
-#include "circuitlist.h"
-#include "circuituse.h"
-#include "connection.h"
-#include "nodelist.h"
-#include "circpathbias.h"
-#include "hs_ntor.h"
-#include "circuitbuild.h"
-#include "networkstatus.h"
-#include "reasons.h"
 
 /* Return a human-readable string for the client fetch status code. */
 static const char *

src/or/rendclient.c

@@ -15,12 +15,13 @@
 #include "config.h"
 #include "connection.h"
 #include "connection_edge.h"
+#include "control.h"
 #include "crypto_rand.h"
 #include "crypto_util.h"
 #include "directory.h"
-#include "hs_common.h"
 #include "hs_circuit.h"
 #include "hs_client.h"
+#include "hs_common.h"
 #include "main.h"
 #include "networkstatus.h"
 #include "nodelist.h"
@@ -31,7 +32,6 @@
 #include "router.h"
 #include "routerlist.h"
 #include "routerset.h"
-#include "control.h"
 
 static extend_info_t *rend_client_get_random_intro_impl(
                           const rend_cache_entry_t *rend_query,

src/or/rendcommon.c

@@ -16,18 +16,18 @@
 #include "control.h"
 #include "crypto_rand.h"
 #include "crypto_util.h"
+#include "hs_client.h"
 #include "hs_common.h"
+#include "hs_intropoint.h"
+#include "networkstatus.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendmid.h"
-#include "hs_intropoint.h"
-#include "hs_client.h"
 #include "rendservice.h"
 #include "rephist.h"
 #include "router.h"
 #include "routerlist.h"
 #include "routerparse.h"
-#include "networkstatus.h"
 
 /** Return 0 if one and two are the same service ids, else -1 or 1 */
 int

src/or/routerparse.c

@@ -56,27 +56,27 @@
 #define ROUTERPARSE_PRIVATE
 
 #include "or.h"
-#include "config.h"
 #include "circuitstats.h"
+#include "config.h"
 #include "crypto_util.h"
 #include "dirserv.h"
 #include "dirvote.h"
+#include "entrynodes.h"
+#include "memarea.h"
+#include "microdesc.h"
+#include "networkstatus.h"
 #include "parsecommon.h"
 #include "policies.h"
 #include "protover.h"
 #include "rendcommon.h"
-#include "router.h"
-#include "routerlist.h"
-#include "memarea.h"
-#include "microdesc.h"
-#include "networkstatus.h"
 #include "rephist.h"
+#include "router.h"
 #include "routerkeys.h"
+#include "routerlist.h"
 #include "routerparse.h"
-#include "entrynodes.h"
-#include "torcert.h"
 #include "sandbox.h"
 #include "shared_random.h"
+#include "torcert.h"
 
 #undef log
 #include <math.h>