diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-05 14:11:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-05 14:11:47 -0500 |
| commit | 4df419a4b19c3b4033b964ec73e82aa988034c81 (patch) | |
| tree | c9067b2662db7966201101b7e5afe41d99fdb432 /src/or/or.h | |
| parent | 3d8cb107323fa5d9cc375087e69a9940b947d0e3 (diff) | |
| parent | 3d0d49be230a8720ebdadf668b993f8ba2c5b2ca (diff) | |
| download | tor-4df419a4b19c3b4033b964ec73e82aa988034c81.tar.gz tor-4df419a4b19c3b4033b964ec73e82aa988034c81.zip | |
Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6170c2119c..b95bfb15a9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4227,6 +4227,7 @@ typedef struct { /** Should we send the timestamps that pre-023 hidden services want? */ int Support022HiddenServices; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |