diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-20 14:26:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-20 14:26:22 -0400 |
| commit | a87f22ef6499818c1ff32f30c66e2e18d1e80ddf (patch) | |
| tree | 86d3dfcfb6aa8239f04efe778a9fc52944c1e0a4 /src/or/or.h | |
| parent | 63a42b38b1ea6c9f1899c6a600363a332d438597 (diff) | |
| parent | 5c5198e713365fecf44741ae6f287c2ebdef18f6 (diff) | |
| download | tor-a87f22ef6499818c1ff32f30c66e2e18d1e80ddf.tar.gz tor-a87f22ef6499818c1ff32f30c66e2e18d1e80ddf.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 88fd38d9d7..4d52710872 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3912,6 +3912,12 @@ typedef struct { * of certain configuration options. */ int TestingTorNetwork; + /** Minimum value for the Exit flag threshold on testing networks. */ + uint64_t TestingMinExitFlagThreshold; + + /** Minimum value for the Fast flag threshold on testing networks. */ + uint64_t TestingMinFastFlagThreshold; + /** If true, and we have GeoIP data, and we're a bridge, keep a per-country * count of how many client addresses have contacted us so that we can help * the bridge authority guess which countries have blocked access to us. */ |