[tor-commits] [tor/master] Merge branch 'ticket27490a_squashed'

[nickm at torproject.org]

commit 2b2b97484ad07c91ac410735a96fe8710e60cf23
Merge: 701eaef98 ad031b64c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Dec 1 20:32:18 2018 -0500

    Merge branch 'ticket27490a_squashed'

 changes/ticket27490            |  6 +++++
 doc/tor.1.txt                  |  6 +++++
 src/app/config/config.c        |  1 +
 src/app/config/or_options_st.h |  3 +++
 src/core/mainloop/connection.c |  5 +++++
 src/core/or/policies.c         | 18 +++++++++++++--
 src/core/or/policies.h         |  1 +
 src/feature/client/bridges.c   |  3 ++-
 src/test/test_policy.c         | 50 ++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 90 insertions(+), 3 deletions(-)

diff --cc src/core/or/policies.c
index 0eda93c5f,c630c2fbd..123fc8566
--- a/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"