summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-13 16:58:45 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-13 16:58:45 -0400
commit62d241ad22b173ee908ad9cc2c55f5b10d22c2d9 (patch)
tree4db71ab176e2f30f399b015d4d7edb2bde1ee96e /src/or/config.c
parent66a564fad8a99a21bd6cda6a70982858376b78e9 (diff)
parent175451d032026f1e1cbf45dfa55a408d5d4abeed (diff)
downloadtor-62d241ad22b173ee908ad9cc2c55f5b10d22c2d9.tar.gz
tor-62d241ad22b173ee908ad9cc2c55f5b10d22c2d9.zip
Merge remote-tracking branch 'isis/bug19476'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 6c0856b141..5e7fb18deb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2805,10 +2805,6 @@ compute_publishserverdescriptor(or_options_t *options)
* will generate too many circuits and potentially overload the network. */
#define MIN_CIRCUIT_STREAM_TIMEOUT 10
-/** Lowest allowable value for HeartbeatPeriod; if this is too low, we might
- * expose more information than we're comfortable with. */
-#define MIN_HEARTBEAT_PERIOD (30*60)
-
/** Lowest recommended value for CircuitBuildTimeout; if it is set too low
* and LearnCircuitBuildTimeout is off, the failure rate for circuit
* construction may be very high. In that case, if it is set below this