diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
| commit | b2d487ae2249a307cd23255dbb1a22241eefd6ef (patch) | |
| tree | cd754fbe8d1c13264749f997f1221b1635a97e49 /src/feature/dircommon | |
| parent | 2d013bbe5cccaccf9ace0beec5a987fb80e850ad (diff) | |
| parent | 7e7a4874b8fa333d1840cc5f2c0b118d6a0e7c47 (diff) | |
| download | tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.tar.gz tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.zip | |
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
Diffstat (limited to 'src/feature/dircommon')
| -rw-r--r-- | src/feature/dircommon/consdiff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c index 2c4d3a19c0..3b6bffbbbd 100644 --- a/src/feature/dircommon/consdiff.c +++ b/src/feature/dircommon/consdiff.c @@ -530,10 +530,12 @@ typedef struct router_id_iterator_t { cdline_t hash; } router_id_iterator_t; +#ifndef COCCI /** * Initializer for a router_id_iterator_t. */ #define ROUTER_ID_ITERATOR_INIT { { NULL, 0 }, { NULL, 0 } } +#endif /** Given an index *<b>idxp</b> into the consensus at <b>cons</b>, advance * the index to the next router line ("r ...") in the consensus, or to |