diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:09:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:09:10 -0400 |
| commit | 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 (patch) | |
| tree | d76a05b933fef271e890e27f7933fa4a6668219b /src/common/container.h | |
| parent | d29c2eb9214a82653a18d51e643d637851dcd145 (diff) | |
| parent | 00ff80e0ae3a07ff3e2148d66d59716bc4630096 (diff) | |
| download | tor-4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611.tar tor-4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/networkstatus.c
Diffstat (limited to 'src/common/container.h')
| -rw-r--r-- | src/common/container.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/container.h b/src/common/container.h index f5e42de76..4a6eba789 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -261,7 +261,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * SMARTLIST_FOREACH_JOIN(routerstatus_list, routerstatus_t *, rs, * routerinfo_list, routerinfo_t *, ri, - * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), + * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), * log_info(LD_GENERAL,"No match for %s", ri->nickname)) { * log_info(LD_GENERAL, "%s matches routerstatus %p", ri->nickname, rs); * } SMARTLIST_FOREACH_JOIN_END(rs, ri); |