diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 18:30:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 18:30:41 -0500 |
| commit | da6c136817983e30349e9733891239b05aa66f09 (patch) | |
| tree | 5c5af254f33ddfdbf8f004410f00ea131b280880 /src/or/or.h | |
| parent | 83f66db79ec6469beea0fb410be6536acb90ffd0 (diff) | |
| parent | 055d6c01fff3324dbb38c2d81ad49ccfdb5432c2 (diff) | |
| download | tor-da6c136817983e30349e9733891239b05aa66f09.tar.gz tor-da6c136817983e30349e9733891239b05aa66f09.zip | |
Merge remote-tracking branch 'asn-mytor/bug4548_take2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 5639226fc3..be7fb413e2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2889,6 +2889,8 @@ typedef struct { char *Address; /**< OR only: configured address for this onion router. */ char *PidFile; /**< Where to store PID of Tor process. */ + int DynamicDHGroups; /**< Dynamic generation of prime moduli for use in DH.*/ + routerset_t *ExitNodes; /**< Structure containing nicknames, digests, * country codes and IP address patterns of ORs to * consider as exits. */ |