aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-31 13:58:33 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-31 13:58:33 -0400
commitb76a161e019dd808119f9e6d3bfa54990e7dcb2c (patch)
tree77e7fad14217bafdb36b9f9bfd30ee9d29e33ea7 /src/or/or.h
parent1f9764f90dfaf31abfb9ffb44601cf98f3d5a67e (diff)
parentade9baaf9b40c419f3ddefe6c8ee8f2c5ec8edce (diff)
downloadtor-b76a161e019dd808119f9e6d3bfa54990e7dcb2c.tar.gz
tor-b76a161e019dd808119f9e6d3bfa54990e7dcb2c.zip
Merge branch 'fix-torrcd-sandbox-22605v2'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index c318c4754a..4572a46458 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4628,6 +4628,9 @@ typedef struct {
smartlist_t *Schedulers;
/* An ordered list of scheduler_types mapped from Schedulers. */
smartlist_t *SchedulerTypes_;
+
+ /** List of files that were opened by %include in torrc and torrc-defaults */
+ smartlist_t *FilesOpenedByIncludes;
} or_options_t;
#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level())