Merge branch 'ticket27490a_squashed'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/app/config/config.c
Simple merge

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

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

diff --cc src/core/or/policies.c
index 0eda93c5f387bd5893298009953059df0a70ef52,c630c2fbdcad89d5596f5f090953f8b53ee296a4..123fc8566e968a824f4a84317c031ed41a1ced55
--- 1/src/core/or/policies.c
--- 2/src/core/or/policies.c
+++ b/src/core/or/policies.c
@@@ -25,10 -23,12 +25,11 @@@
  #include "feature/nodelist/microdesc.h"
  #include "feature/nodelist/networkstatus.h"
  #include "feature/nodelist/nodelist.h"
 -#include "core/or/policies.h"
  #include "feature/relay/router.h"
 -#include "feature/nodelist/routerparse.h"
 -#include "feature/stats/geoip.h"
 +#include "feature/relay/routermode.h"
 +#include "lib/geoip/geoip.h"
  #include "ht.h"
+ #include "lib/crypt_ops/crypto_rand.h"
  #include "lib/encoding/confline.h"
  
  #include "core/or/addr_policy_st.h"

diff --cc src/feature/client/bridges.c
Simple merge

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