Merge branch 'bug27800-034' into bug27800-035

diff --cc src/feature/nodelist/nodelist.c
index 600dfcf56cd438dc0d49bf4ec3047eef5e306358,fcd5e0220bccb7eeeeaaaf91ba59e3141a1db300..a98a5c8655c1365d0cf5a0fb12945f504f478e1d
--- 1/src/feature/nodelist/nodelist.c
--- 2/src/or/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -40,32 -40,31 +40,34 @@@
  
  #define NODELIST_PRIVATE
  
 -#include "or.h"
 -#include "address.h"
 -#include "address_set.h"
 -#include "backtrace.h"
 -#include "bridges.h"
 -#include "config.h"
 -#include "control.h"
 -#include "dirserv.h"
 -#include "entrynodes.h"
 -#include "geoip.h"
 -#include "hs_common.h"
 -#include "hs_client.h"
 -#include "main.h"
 -#include "microdesc.h"
 -#include "networkstatus.h"
 -#include "nodelist.h"
 -#include "policies.h"
 -#include "protover.h"
 -#include "rendservice.h"
 -#include "router.h"
 -#include "routerlist.h"
 -#include "routerparse.h"
 -#include "routerset.h"
 -#include "torcert.h"
 -#include "util_format.h"
 +#include "core/or/or.h"
 +#include "app/config/config.h"
 +#include "core/mainloop/mainloop.h"
 +#include "core/mainloop/netstatus.h"
 +#include "core/or/address_set.h"
 +#include "core/or/policies.h"
 +#include "core/or/protover.h"
 +#include "feature/client/bridges.h"
 +#include "feature/client/entrynodes.h"
 +#include "feature/control/control.h"
 +#include "feature/dirauth/process_descs.h"
 +#include "feature/dircache/dirserv.h"
 +#include "feature/hs/hs_client.h"
 +#include "feature/hs/hs_common.h"
 +#include "feature/nodelist/describe.h"
 +#include "feature/nodelist/dirlist.h"
 +#include "feature/nodelist/microdesc.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/node_select.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "feature/nodelist/routerlist.h"
 +#include "feature/nodelist/routerset.h"
 +#include "feature/nodelist/torcert.h"
 +#include "feature/rend/rendservice.h"
++#include "lib/encoding/binascii.h"
++#include "lib/err/backtrace.h"
 +#include "lib/geoip/geoip.h"
 +#include "lib/net/address.h"
  
  #include <string.h>
  

diff --cc src/test/test_nodelist.c
index cdd5e95cf09051730907f48a06f57871ad7affa1,7d8e57543c5c97ed03ae2cbae27ad6edbf19812f..1af6db68ec8fad4f3ad14b4bdfff79716f1cb67f
--- 1/src/test/test_nodelist.c
--- 2/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@@ -6,19 -6,13 +6,20 @@@
   * \brief Unit tests for nodelist related functions.
   **/
  
 -#include "or.h"
 -#include "crypto_rand.h"
 -#include "networkstatus.h"
 -#include "nodelist.h"
 -#include "torcert.h"
 -#include "test.h"
 -#include "log_test_helpers.h"
 +#include "core/or/or.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "feature/nodelist/torcert.h"
 +
 +#include "feature/nodelist/microdesc_st.h"
 +#include "feature/nodelist/networkstatus_st.h"
 +#include "feature/nodelist/node_st.h"
 +#include "feature/nodelist/routerinfo_st.h"
 +#include "feature/nodelist/routerstatus_st.h"
 +
 +#include "test/test.h"
++#include "test/log_test_helpers.h"
  
  /** Test the case when node_get_by_id() returns NULL,
   * node_get_verbose_nickname_by_id should return the base 16 encoding