diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
| commit | c0391bae75e9eb71f5fa2ab24fc97792c204225d (patch) | |
| tree | 9701969423b86fdc2ba04080338d817c3b5c9864 /src/or/config.c | |
| parent | 2cb59be9993ecec13ceabc0c4754e52f8c5ea4e5 (diff) | |
| parent | ec6c155f827000e337796f1f1c54299fbc5cf72a (diff) | |
| download | tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.tar.gz tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.zip | |
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index e53c2888f1..6d3b133389 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -9,8 +9,6 @@ * \brief Code to parse and interpret configuration files. **/ -#define CONFIG_PRIVATE - #include "or.h" #include "addressmap.h" #include "channel.h" |