diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-13 14:32:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-13 14:32:43 -0400 |
| commit | d950e243328eaac40515b4b16ac328f6748c7a3f (patch) | |
| tree | 6b8f2c8202137a277cb3576c0153392927408a8b /src/or/dirserv.c | |
| parent | 032e3b733f7bf304a778459597e7ed7b371234c7 (diff) | |
| parent | 9df61d7028936257538b15d1d3f8e04a370edb09 (diff) | |
| download | tor-d950e243328eaac40515b4b16ac328f6748c7a3f.tar.gz tor-d950e243328eaac40515b4b16ac328f6748c7a3f.zip | |
Merge remote-tracking branch 'public/bug11243_squashed'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 9bc016fb67..5a41247aa0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -478,7 +478,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, s = desc; list = smartlist_new(); if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 0, 0, - annotation_buf)) { + annotation_buf, NULL)) { SMARTLIST_FOREACH(list, routerinfo_t *, ri, { msg_out = NULL; tor_assert(ri->purpose == purpose); @@ -494,7 +494,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, s = desc; if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 1, 0, - NULL)) { + NULL, NULL)) { SMARTLIST_FOREACH(list, extrainfo_t *, ei, { msg_out = NULL; |