summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-20 11:16:17 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-20 11:16:17 -0500
commit7ca0a9c4aec374f5fbddc7847c543c5ba9e44869 (patch)
tree4e02cbfec3202d0057ba9953bc0dfa25c5a8367e /src/or/or.h
parentc99ec36defadf763034b82107f6168987668862f (diff)
parentd4f4108601fe7e2614f30055ff5abe00460f6a12 (diff)
downloadtor-7ca0a9c4aec374f5fbddc7847c543c5ba9e44869.tar.gz
tor-7ca0a9c4aec374f5fbddc7847c543c5ba9e44869.zip
Merge remote-tracking branch 'ahf-oniongit/bugs/24605'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 9c53949879..aa2802fe83 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3972,6 +3972,8 @@ typedef struct {
int HeartbeatPeriod; /**< Log heartbeat messages after this many seconds
* have passed. */
+ int MainloopStats; /**< Log main loop statistics as part of the
+ * heartbeat messages. */
char *HTTPProxy; /**< hostname[:port] to use as http proxy, if any. */
tor_addr_t HTTPProxyAddr; /**< Parsed IPv4 addr for http proxy, if any. */