Merge branch 'pre_formatter_cleanups_squashed'

diff --cc src/app/config/or_options_st.h
Simple merge

diff --cc src/core/crypto/hs_ntor.h
Simple merge

diff --cc src/core/mainloop/connection.h
Simple merge

diff --cc src/core/or/channel.h
Simple merge

diff --cc src/core/or/circuit_st.h
Simple merge

diff --cc src/core/or/scheduler.h
index 1a142986829b3b97d29ccad604d751e4fbe248db,03cb456755cef49856f017d0a0bf79ce453574c0..82df2b0b0f797a16c618768e5e1c3d2abf4c680a
--- 1/src/core/or/scheduler.h
--- 2/src/core/or/scheduler.h
+++ b/src/core/or/scheduler.h
@@@ -136,8 -136,10 +136,10 @@@ MOCK_DECL(void, scheduler_channel_has_w
   * These functions are only visible to the scheduling system, the current
   * scheduler implementation, and tests.
   *****************************************************************************/
 -#ifdef SCHEDULER_PRIVATE_
 +#ifdef SCHEDULER_PRIVATE
  
+ #include "ext/ht.h"
+ 
  /*********************************
   * Defined in scheduler.c
   *********************************/
@@@ -212,7 -214,6 +214,6 @@@ extern int32_t sched_run_interval
  
  scheduler_t *get_vanilla_scheduler(void);
  
 -#endif /* defined(SCHEDULER_PRIVATE_) */
 +#endif /* defined(SCHEDULER_PRIVATE) */
  
  #endif /* !defined(TOR_SCHEDULER_H) */
- 

diff --cc src/feature/control/control_hs.h
index 8b9ebaba199f2eb5aee0c217467953f19e0bb759,da96866f55bede155c871537ff40a68f0e2afa71..8a0cd6818d8117b46ed96f4264cb7c7b099a27e7
--- 1/src/feature/control/control_hs.h
--- 2/src/feature/control/control_hs.h
+++ b/src/feature/control/control_hs.h
@@@ -18,16 -20,15 +20,15 @@@ extern const struct control_cmd_syntax_
  extern const struct control_cmd_syntax_t onion_client_auth_view_syntax;
  
  int
- handle_control_onion_client_auth_add(control_connection_t *conn,
-                                      const control_cmd_args_t *args);
+ handle_control_onion_client_auth_add(struct control_connection_t *conn,
+                                      const struct control_cmd_args_t *args);
  
  int
- handle_control_onion_client_auth_remove(control_connection_t *conn,
-                                         const control_cmd_args_t *args);
+ handle_control_onion_client_auth_remove(struct control_connection_t *conn,
+                                         const struct control_cmd_args_t *args);
  
  int
- handle_control_onion_client_auth_view(control_connection_t *conn,
-                                       const control_cmd_args_t *args);
+ handle_control_onion_client_auth_view(struct control_connection_t *conn,
+                                       const struct control_cmd_args_t *args);
  
 -#endif
 +#endif /* !defined(TOR_CONTROL_HS_H) */
- 

diff --cc src/feature/dirauth/authmode.c
Simple merge

diff --cc src/feature/dirauth/authmode.h
Simple merge

diff --cc src/feature/dirauth/keypin.h
Simple merge

diff --cc src/feature/dircache/conscache.h
Simple merge

diff --cc src/feature/dircache/consdiffmgr.h
Simple merge

diff --cc src/feature/dirparse/routerparse.h
index ca9250fa9a3849c6aa4daf4604c9e4b3e92d4ce4,cedbfbf3328af48f18358f18d8f3f5a073741113..519044e9b0dec9cdd3b8e7c50bc36dad95523175
--- 1/src/feature/dirparse/routerparse.h
--- 2/src/feature/dirparse/routerparse.h
+++ b/src/feature/dirparse/routerparse.h
@@@ -40,7 -40,8 +40,8 @@@ int find_single_ipv6_orport(const smart
  void routerparse_init(void);
  void routerparse_free_all(void);
  
 -#ifdef EXPOSE_ROUTERDESC_TOKEN_TABLE
 +#ifdef ROUTERDESC_TOKEN_TABLE_PRIVATE
+ #include "feature/dirparse/parsecommon.h"
  extern const struct token_rule_t routerdesc_token_table[];
  #endif
  

diff --cc src/feature/hs/hs_circuit.h
Simple merge

diff --cc src/feature/hs/hs_circuitmap.h
Simple merge

diff --cc src/feature/hs/hs_service.h
Simple merge

diff --cc src/feature/nodelist/microdesc_st.h
Simple merge

diff --cc src/feature/nodelist/node_st.h
Simple merge

diff --cc src/feature/relay/dns_structs.h
Simple merge

diff --cc src/feature/stats/geoip_stats.h
Simple merge

diff --cc src/lib/cc/compat_compiler.h
Simple merge

diff --cc src/lib/compress/compress_zstd.c
Simple merge

diff --cc src/lib/conf/conftesting.h
Simple merge

diff --cc src/lib/crypt_ops/aes_nss.c
Simple merge

diff --cc src/lib/crypt_ops/aes_openssl.c
index 4ee22647de7b2ea7f36e92015834f4984f630002,ce386ac686cc57bc74704d6681046a3d313e3cb3..502f7703bd244c875071f8d5f2e1b484de99b7a9
--- 1/src/lib/crypt_ops/aes_openssl.c
--- 2/src/lib/crypt_ops/aes_openssl.c
+++ b/src/lib/crypt_ops/aes_openssl.c
@@@ -37,8 -37,9 +37,8 @@@ DISABLE_GCC_WARNING("-Wredundant-decls"
  #include <openssl/engine.h>
  #include <openssl/modes.h>
  
- ENABLE_GCC_WARNING(redundant-decls)
+ ENABLE_GCC_WARNING("-Wredundant-decls")
  
 -#include "lib/crypt_ops/aes.h"
  #include "lib/log/log.h"
  #include "lib/ctime/di_ops.h"
  

diff --cc src/lib/crypt_ops/crypto_dh_openssl.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_digest_nss.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_digest_openssl.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_nss_mgt.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_openssl_mgt.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_rand.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_rsa_nss.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_rsa_openssl.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_util.c
Simple merge

diff --cc src/lib/evloop/timers.h
Simple merge

diff --cc src/lib/fdio/fdio.h
Simple merge

diff --cc src/lib/math/fp.c
Simple merge

diff --cc src/lib/meminfo/meminfo.c
Simple merge

diff --cc src/lib/process/process.h
Simple merge

diff --cc src/lib/tls/tortls_internal.h
Simple merge

diff --cc src/lib/tls/tortls_nss.c
Simple merge

diff --cc src/lib/tls/tortls_openssl.c
Simple merge

diff --cc src/lib/tls/x509_openssl.c
Simple merge

diff --cc src/test/test_bt_cl.c
Simple merge

diff --cc src/test/test_circuitlist.c
Simple merge

diff --cc src/test/test_config.c
Simple merge

diff --cc src/test/test_crypto.c
Simple merge

diff --cc src/test/test_dir_handle_get.c
Simple merge

diff --cc src/test/test_helpers.c
Simple merge

diff --cc src/test/test_hs_descriptor.c
Simple merge

diff --cc src/test/test_microdesc.c
Simple merge

diff --cc src/test/test_tortls_openssl.c
Simple merge

diff --cc src/tools/tor-gencert.c
Simple merge