aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-05 14:32:05 -0500
committerNick Mathewson <nickm@torproject.org>2014-03-05 14:32:05 -0500
commit103cebd9243367106909251e73ee97aafe9d201c (patch)
treed0e3b8328531a0e283cda1075a33910e467a7410 /src/or/or.h
parentf0b2dc83b60b0de1644ce9fb5e19fef516e9ffde (diff)
parent25374d307d5fc0731eb116dc8e9840bfbbff9167 (diff)
downloadtor-103cebd9243367106909251e73ee97aafe9d201c.tar
tor-103cebd9243367106909251e73ee97aafe9d201c.tar.gz
Merge branch 'ticket9176_squashed'
Conflicts: doc/tor.1.txt
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 0df5af12c..7043e2f97 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3638,6 +3638,10 @@ typedef struct {
* a new one? */
int MaxCircuitDirtiness; /**< Never use circs that were first used more than
this interval ago. */
+ int PredictedCircsRelevanceTime; /** How long after we've requested a
+ * connection for a given port, do we want
+ * to continue to pick exits that support
+ * that port? */
uint64_t BandwidthRate; /**< How much bandwidth, on average, are we willing
* to use in a second? */
uint64_t BandwidthBurst; /**< How much bandwidth, at maximum, are we willing