commit c200ab46b85cece87a4bcdbaacd41bc6539d1671 Merge: fd7e9e9 6a9cae2 Author: teor <teor2345@gmail.com> Date: Sat Jan 10 16:34:10 2015 +1100 Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty Conflicts: src/or/router.c Choose newer comment. Merge changes to comment and function invocation. README | 3 + changes/bug13126 | 10 + changes/bug13214 | 7 + changes/bug13296 | 5 + changes/bug13315 | 5 + changes/bug13399 | 12 + changes/bug13447 | 5 + changes/bug13644 | 4 + changes/bug13678 | 6 + changes/bug13698 | 6 + changes/bug13701 | 4 + changes/bug13707 | 4 + changes/bug13713 | 3 + changes/bug13840 | 3 + changes/bug13941 | 6 + changes/bug13942 | 5 + changes/bug14001-clang-warning | 6 + changes/bug7484 | 4 + changes/bug7803 | 5 + changes/bug9812 | 6 + changes/doc13381 | 5 + changes/feature13212 | 4 + changes/feature9503 | 4 + changes/geoip-november2014 | 3 + changes/geoip6-november2014 | 3 + changes/global_scheduler | 12 + changes/no_global_ccc | 3 + changes/ticket-11291 | 4 + changes/ticket13172 | 4 + changes/tickets6456 | 6 + doc/tor.1.txt | 64 +- scripts/coccinelle/calloc.cocci | 15 +- scripts/maint/checkSpace.pl | 3 +- src/common/address.c | 8 +- src/common/compat.c | 2 +- src/common/compat.h | 9 + src/common/compat_libevent.c | 6 +- src/common/compat_libevent.h | 2 +- src/common/crypto.c | 2 +- src/common/log.c | 2 +- src/common/torlog.h | 4 +- src/common/util.c | 150 +- src/common/util.h | 7 +- src/config/geoip |20036 +++++++++++++++++++++++++------------ src/config/geoip6 | 5649 ++++++++++- src/ext/tinytest_demo.c | 16 +- src/or/Makefile.nmake | 1 + src/or/buffers.c | 18 +- src/or/buffers.h | 2 +- src/or/channel.c | 477 +- src/or/channel.h | 87 +- src/or/channeltls.c | 144 +- src/or/channeltls.h | 2 - src/or/circuitbuild.c | 10 +- src/or/circuitlist.c | 46 +- src/or/circuitlist.h | 3 +- src/or/circuitmux.c | 56 +- src/or/circuitmux.h | 12 +- src/or/circuitmux_ewma.c | 58 +- src/or/circuitstats.c | 6 +- src/or/circuituse.c | 12 +- src/or/config.c | 348 +- src/or/config.h | 5 +- src/or/connection.c | 2 + src/or/connection_edge.c | 15 +- src/or/connection_or.c | 67 +- src/or/connection_or.h | 8 +- src/or/control.c | 38 +- src/or/control.h | 6 +- src/or/cpuworker.c | 2 +- src/or/directory.c | 22 +- src/or/dirserv.c | 18 +- src/or/dirvote.c | 30 +- src/or/entrynodes.c | 4 +- src/or/entrynodes.h | 2 +- src/or/geoip.c | 4 +- src/or/include.am | 2 + src/or/main.c | 51 +- src/or/main.h | 4 +- src/or/microdesc.c | 36 +- src/or/microdesc.h | 2 +- src/or/networkstatus.c | 2 +- src/or/nodelist.c | 2 +- src/or/or.h | 57 +- src/or/relay.c | 15 +- src/or/relay.h | 3 +- src/or/rendclient.c | 25 +- src/or/rendcommon.c | 19 + src/or/rendcommon.h | 1 + src/or/rendservice.c | 244 +- src/or/router.c | 24 +- src/or/router.h | 2 +- src/or/routerlist.c | 288 +- src/or/routerlist.h | 4 +- src/or/scheduler.c | 709 ++ src/or/scheduler.h | 50 + src/or/transports.c | 12 +- src/or/transports.h | 10 +- src/test/Makefile.nmake | 11 +- src/test/fakechans.h | 25 + src/test/include.am | 6 + src/test/test.c | 171 +- src/test/test.h | 2 +- src/test/test_addr.c | 469 +- src/test/test_buffers.c | 338 +- src/test/test_cell_formats.c | 775 +- src/test/test_cell_queue.c | 58 +- src/test/test_channel.c | 1669 +++ src/test/test_channeltls.c | 332 + src/test/test_checkdir.c | 140 + src/test/test_circuitlist.c | 128 +- src/test/test_circuitmux.c | 15 +- src/test/test_config.c | 315 +- src/test/test_containers.c | 391 +- src/test/test_controller_events.c | 52 +- src/test/test_crypto.c | 541 +- src/test/test_dir.c | 710 +- src/test/test_entrynodes.c | 108 +- src/test/test_extorport.c | 187 +- src/test/test_hs.c | 18 +- src/test/test_introduce.c | 2 +- src/test/test_logging.c | 30 +- src/test/test_microdesc.c | 162 +- src/test/test_nodelist.c | 4 +- src/test/test_oom.c | 80 +- src/test/test_options.c | 6 +- src/test/test_policy.c | 40 +- src/test/test_pt.c | 72 +- src/test/test_relay.c | 134 + src/test/test_relaycell.c | 54 +- src/test/test_replay.c | 52 +- src/test/test_routerkeys.c | 16 +- src/test/test_routerset.c | 276 +- src/test/test_scheduler.c | 763 ++ src/test/test_socks.c | 320 +- src/test/test_status.c | 245 +- src/test/test_util.c | 2253 +++-- 137 files changed, 28930 insertions(+), 11239 deletions(-) diff --cc src/or/router.c index 94ae2e7,56bb909..f0317aa --- a/src/or/router.c +++ b/src/or/router.c @@@ -885,9 -880,7 +889,9 @@@ init_keys(void keydir = get_datadir_fname2("keys", "secret_onion_key.old"); if (!lastonionkey && file_status(keydir) == FN_FILE) { - prkey = init_key_from_file(keydir, 1, LOG_ERR, 0); /* XXXX Why 1? */ + /* Load keys from non-empty files only. + * Missing old keys won't be replaced with freshly generated keys. */ - prkey = init_key_from_file(keydir, 0, LOG_ERR); ++ prkey = init_key_from_file(keydir, 0, LOG_ERR, 0); if (prkey) lastonionkey = prkey; }