Parse GuardFraction info from consensuses and votes.

Also introduce the UseGuardFraction torrc option which decides whether
clients should use guardfraction information found in the consensus.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/or/or.h b/src/or/or.h
index 1f2231e78c..b8d4e1a3ef 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3818,6 +3818,12 @@ typedef struct {
   int NumEntryGuards; /**< How many entry guards do we try to establish? */
   int UseEntryGuardsAsDirGuards; /** Boolean: Do we try to get directory info
                                   * from a smallish number of fixed nodes? */
+
+  /** If 1, we use any guardfraction information we see in the
+   * consensus.  If 0, we don't.  If -1, let the consensus parameter
+   * decide. */
+  int UseGuardFraction;
+
   int NumDirectoryGuards; /**< How many dir guards do we try to establish?
                            * If 0, use value from NumEntryGuards. */
   int RephistTrackTime; /**< How many seconds do we keep rephist info? */