Merge remote-tracking branch 'public/bug13104_025'

diff --cc src/common/util.c
Simple merge

diff --cc src/or/routerlist.c
index a01818102699f94039a705e2e4c6b02e7674165b,0df411b822952c72fd20697294edb08c552e867c..1faa05f06f4900c431c3da7aff50cc85a000929a
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -1804,10 -1802,10 +1804,10 @@@ scale_array_elements_to_u64(u64_dbl_t *
                              uint64_t *total_out)
  {
    double total = 0.0;
-   double scale_factor;
+   double scale_factor = 0.0;
    int i;
    /* big, but far away from overflowing an int64_t */
 -#define SCALE_TO_U64_MAX (INT64_MAX / 4)
 +#define SCALE_TO_U64_MAX ((int64_t) (INT64_MAX / 4))
  
    for (i = 0; i < n_entries; ++i)
      total += entries[i].dbl;

diff --cc src/test/test_dir.c
Simple merge

diff --cc src/test/test_util.c
Simple merge