summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-10-25 12:33:21 -0700
committerSebastian Hahn <sebastian@torproject.org>2011-10-26 23:56:47 +0200
commit4684ced1b3fced0543fa65bf01f75c5d81eaf464 (patch)
treefd515c09cd317e8d3aecce27e95da6b42979d62f /src/or/config.c
parent00fffbc1a15e2696a89c721d0c94dc333ff419ef (diff)
downloadtor-4684ced1b3fced0543fa65bf01f75c5d81eaf464.tar.gz
tor-4684ced1b3fced0543fa65bf01f75c5d81eaf464.zip
Add option to give guard flag to relays without the CVE-2011-2768 fix
This way, all of the DA operators can upgrade immediately, without nuking every client's set of entry guards as soon as a majority of them upgrade. Until enough guards have upgraded, a majority of dirauths should set this config option so that there are still enough guards in the network. After a few days pass, all dirauths should use the default.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 230ccf25c0..78e433620d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -269,6 +269,8 @@ static config_var_t _option_vars[] = {
V(GeoIPFile, FILENAME,
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
#endif
+ V(GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays,
+ BOOL, "0"),
OBSOLETE("Group"),
V(HardwareAccel, BOOL, "0"),
V(AccelName, STRING, NULL),