[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'

[nickm at torproject.org]

commit 2edfdc02a29e73a01f360f257d8dfe916a7a5b45
Merge: cacea91 f8ffb57
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 12 14:06:14 2015 -0500

    Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'

 changes/bug13111-generate-keys-on-empty-file |   23 ++++++
 changes/bug14001-clang-warning               |    6 ++
 src/common/compat.c                          |    1 +
 src/common/util.c                            |   32 ++++++--
 src/common/util.h                            |    2 +-
 src/or/config.c                              |   22 +++--
 src/or/router.c                              |   30 +++++--
 src/or/routerlist.c                          |    1 +
 src/or/statefile.c                           |    3 +
 src/test/include.am                          |    4 +-
 src/test/zero_length_keys.sh                 |  113 ++++++++++++++++++++++++++
 11 files changed, 214 insertions(+), 23 deletions(-)