[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit adfcc1da4aac9766274275460fe2252bd9ffe4eb
Merge: e6590ef 3d51545
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 17 13:18:00 2013 -0500

    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.

 changes/bug10409          |    3 +++
 src/or/dirvote.c          |    3 ++-
 src/or/microdesc.c        |    3 +--
 src/or/routerparse.c      |   13 ++++++++++---
 src/or/routerparse.h      |    2 +-
 src/test/test_microdesc.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 62 insertions(+), 7 deletions(-)

diff --cc src/or/microdesc.c
index 7765d27,c4907fa..2bf6f54
--- 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);
    }