commit c9e4ebf96a9d5fe8d6ae74be96ea00f8c5d493ac Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 15 12:52:22 2018 -0400

Move fp_pair_t declaration to fp_pair.h. --- src/or/directory.c | 1 + src/or/fp_pair.h | 6 ++++++ src/or/or.h | 8 -------- src/test/test_dir.c | 1 + 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c index 720ef975b..00605c054 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -23,6 +23,7 @@ #include "directory.h" #include "dirserv.h" #include "entrynodes.h" +#include "fp_pair.h" #include "geoip.h" #include "hs_cache.h" #include "hs_common.h" diff --git a/src/or/fp_pair.h b/src/or/fp_pair.h index 4498a1610..3c5c33bcb 100644 --- a/src/or/fp_pair.h +++ b/src/or/fp_pair.h @@ -9,6 +9,12 @@ #ifndef _TOR_FP_PAIR_H #define _TOR_FP_PAIR_H

+/** A pair of digests created by dir_split_resource_info_fingerprint_pairs() */ +typedef struct { + char first[DIGEST_LEN]; + char second[DIGEST_LEN]; +} fp_pair_t; + /* * Declare fp_pair_map_t functions and structs */ diff --git a/src/or/or.h b/src/or/or.h index dd46bfd05..5b7d4344c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3877,14 +3877,6 @@ typedef enum { BOOTSTRAP_STATUS_DONE=100 } bootstrap_status_t;

-/********************************* directory.c ***************************/ - -/** A pair of digests created by dir_split_resource_info_fingerprint_pairs() */ -typedef struct { - char first[DIGEST_LEN]; - char second[DIGEST_LEN]; -} fp_pair_t; - /********************************* dirserv.c ***************************/

/** An enum to describe what format we're generating a routerstatus line in. diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 5bcbc80e8..43fc5c5fb 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -28,6 +28,7 @@ #include "dirserv.h" #include "dirauth/dirvote.h" #include "entrynodes.h" +#include "fp_pair.h" #include "hibernate.h" #include "memarea.h" #include "networkstatus.h"