From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Dec 2013 18:18:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adfcc1da4aac9766274275460fe2252bd9ffe4eb;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
	src/or/microdesc.c

Conflict because one change was on line adjacent to line where
01206893 got fixed.
---

adfcc1da4aac9766274275460fe2252bd9ffe4eb
diff --cc src/or/microdesc.c
index 7765d27da6,c4907faf6f..2bf6f54ab6
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@@ -157,9 -157,8 +157,8 @@@ microdescs_add_to_cache(microdesc_cache
  
    descriptors = microdescs_parse_from_string(s, eos,
                                               allow_annotations,
-                                              copy_body);
+                                              where);
 -  if (listed_at > 0) {
 +  if (listed_at != (time_t)-1) {
      SMARTLIST_FOREACH(descriptors, microdesc_t *, md,
                        md->last_listed = listed_at);
    }