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.

diff --cc src/or/dirvote.c
Simple merge

diff --cc src/or/microdesc.c
index 7765d27da60ccf12392c0701c43689aca1c71f2a,c4907faf6f6e665ca96073201621f9f72b25a62b..2bf6f54ab6cb4ce28085bf3a4e84ea5e36c594fd
--- 1/src/or/microdesc.c
--- 2/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);
    }

diff --cc src/or/routerparse.c
Simple merge