diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:03:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:03:04 -0400 |
| commit | ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3 (patch) | |
| tree | 1debba1496513f76473c42cd910ffe86a074d9e1 /src/or/geoip.c | |
| parent | 118d8ffdcb74137a36d22928ce6f46897809391e (diff) | |
| parent | fc647832783cab352bebba63fe0210d7be395058 (diff) | |
| download | tor-ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3.tar.gz tor-ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3.zip | |
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
Conflicts:
src/or/or.h
Diffstat (limited to 'src/or/geoip.c')
| -rw-r--r-- | src/or/geoip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c index 28f570a966..5bb2410a75 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -601,8 +601,9 @@ _dirreq_map_put(dirreq_map_entry_t *entry, dirreq_type_t type, tor_assert(entry->type == type); tor_assert(entry->dirreq_id == dirreq_id); - /* XXXX022 once we're sure the bug case never happens, we can switch - * to HT_INSERT */ + /* XXXX we could switch this to HT_INSERT some time, since it seems that + * this bug doesn't happen. But since this function doesn't seem to be + * critical-path, it's sane to leave it alone. */ old_ent = HT_REPLACE(dirreqmap, &dirreq_map, entry); if (old_ent && old_ent != entry) { log_warn(LD_BUG, "Error when putting directory request into local " |