[tor-commits] [tor/master] Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty

nickm at torproject.org nickm at torproject.org
Mon Jan 12 19:20:56 UTC 2015


commit f8ffb57bc4430ff9bbd7560eecdda4284b2799ba
Merge: debd786 33df3e3
Author: teor <teor2345 at gmail.com>
Date:   Sat Jan 10 17:20:06 2015 +1100

    Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty
    
    Conflicts:
      src/or/connection_edge.c
    Merged in favour of origin.

 ChangeLog                                      |  298 +++++++++++-
 LICENSE                                        |   33 +-
 Makefile.am                                    |   15 +-
 acinclude.m4                                   |    2 +-
 changes/bug11791                               |    4 +
 changes/bug12509                               |    4 +
 changes/bug12985                               |    5 +
 changes/bug13126                               |   10 -
 changes/bug13214                               |    7 -
 changes/bug13296                               |    5 -
 changes/bug13315                               |    5 -
 changes/bug13399                               |   12 -
 changes/bug13399_part1                         |    3 -
 changes/bug13447                               |    5 -
 changes/bug13644                               |    4 -
 changes/bug13661                               |    6 +
 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/bug13988                               |    3 +
 changes/bug14072                               |    3 +
 changes/bug14106                               |    4 +
 changes/bug14116_025                           |    3 +
 changes/bug14123                               |    4 +
 changes/bug14125                               |    5 +
 changes/bug7484                                |    4 -
 changes/bug7803                                |    5 -
 changes/bug9286                                |    4 +
 changes/bug9812                                |    6 -
 changes/doc13381                               |    5 -
 changes/feature10067                           |   12 +
 changes/feature13212                           |    4 -
 changes/feature9503                            |    4 -
 changes/fix-test-cmdline-args                  |    4 +
 changes/geoip-november2014                     |    3 -
 changes/geoip6-november2014                    |    3 -
 changes/global_scheduler                       |   12 -
 changes/no_global_ccc                          |    3 -
 changes/spurious-clang-warnings                |   10 -
 changes/ticket-11291                           |    4 -
 changes/ticket13172                            |    4 -
 changes/ticket14107                            |    6 +
 changes/ticket14128                            |    5 +
 changes/tickets6456                            |    6 -
 configure.ac                                   |  100 +++-
 contrib/win32build/tor-mingw.nsi.in            |    2 +-
 doc/tor.1.txt                                  |   25 +
 m4/pkg.m4                                      |  214 +++++++++
 scripts/codegen/gen_server_ciphers.py          |    2 +-
 scripts/codegen/get_mozilla_ciphers.py         |    2 +-
 scripts/codegen/makedesc.py                    |    2 +-
 scripts/maint/format_changelog.py              |    2 +-
 scripts/maint/lintChanges.py                   |   52 +++
 scripts/maint/redox.py                         |    2 +-
 scripts/maint/sortChanges.py                   |    8 +-
 scripts/maint/updateCopyright.pl               |    7 +
 src/common/address.c                           |   18 +-
 src/common/address.h                           |    7 +-
 src/common/aes.c                               |    2 +-
 src/common/aes.h                               |    2 +-
 src/common/backtrace.c                         |    2 +-
 src/common/backtrace.h                         |    2 +-
 src/common/compat.c                            |   24 +-
 src/common/compat.h                            |    5 +-
 src/common/compat_libevent.c                   |   16 +-
 src/common/compat_libevent.h                   |    7 +-
 src/common/container.c                         |    2 +-
 src/common/container.h                         |    2 +-
 src/common/crypto.c                            |   10 +-
 src/common/crypto.h                            |    4 +-
 src/common/crypto_curve25519.c                 |    2 +-
 src/common/crypto_curve25519.h                 |    2 +-
 src/common/crypto_ed25519.c                    |    2 +-
 src/common/crypto_ed25519.h                    |    2 +-
 src/common/crypto_format.c                     |    2 +-
 src/common/crypto_s2k.c                        |    2 +-
 src/common/crypto_s2k.h                        |    2 +-
 src/common/di_ops.c                            |    2 +-
 src/common/di_ops.h                            |    2 +-
 src/common/log.c                               |    2 +-
 src/common/memarea.c                           |    2 +-
 src/common/memarea.h                           |    2 +-
 src/common/mempool.c                           |    2 +-
 src/common/mempool.h                           |    2 +-
 src/common/procmon.c                           |    2 +-
 src/common/procmon.h                           |    2 +-
 src/common/sandbox.c                           |   35 +-
 src/common/sandbox.h                           |    4 +-
 src/common/testsupport.h                       |    6 +-
 src/common/torgzip.c                           |   52 ++-
 src/common/torgzip.h                           |   14 +-
 src/common/torint.h                            |    6 +-
 src/common/torlog.h                            |    2 +-
 src/common/tortls.c                            |    2 +-
 src/common/tortls.h                            |    2 +-
 src/common/util.c                              |   73 ++-
 src/common/util.h                              |    7 +-
 src/common/util_process.c                      |    2 +-
 src/common/util_process.h                      |    2 +-
 src/ext/ht.h                                   |    2 +-
 src/ext/trunnel/trunnel-impl.h                 |    2 +-
 src/ext/trunnel/trunnel.c                      |    2 +-
 src/ext/trunnel/trunnel.h                      |    2 +-
 src/or/addressmap.c                            |   30 +-
 src/or/addressmap.h                            |    2 +-
 src/or/buffers.c                               |    6 +-
 src/or/buffers.h                               |    2 +-
 src/or/channel.c                               |  124 ++---
 src/or/channel.h                               |   37 +-
 src/or/channeltls.c                            |   16 +-
 src/or/channeltls.h                            |    2 +-
 src/or/circpathbias.c                          |    6 +-
 src/or/circpathbias.h                          |    2 +-
 src/or/circuitbuild.c                          |   28 +-
 src/or/circuitbuild.h                          |    2 +-
 src/or/circuitlist.c                           |   10 +-
 src/or/circuitlist.h                           |    2 +-
 src/or/circuitmux.c                            |    2 +-
 src/or/circuitmux.h                            |    2 +-
 src/or/circuitmux_ewma.c                       |    2 +-
 src/or/circuitmux_ewma.h                       |    2 +-
 src/or/circuitstats.c                          |    2 +-
 src/or/circuitstats.h                          |    2 +-
 src/or/circuituse.c                            |  102 ++--
 src/or/circuituse.h                            |    2 +-
 src/or/command.c                               |   11 +-
 src/or/command.h                               |    2 +-
 src/or/config.c                                |  160 +++++--
 src/or/config.h                                |    2 +-
 src/or/confparse.c                             |    2 +-
 src/or/confparse.h                             |    2 +-
 src/or/connection.c                            |   11 +-
 src/or/connection.h                            |    2 +-
 src/or/connection_edge.c                       |   61 ++-
 src/or/connection_edge.h                       |    2 +-
 src/or/connection_or.c                         |   14 +-
 src/or/connection_or.h                         |    2 +-
 src/or/control.c                               |   90 +++-
 src/or/control.h                               |    3 +-
 src/or/cpuworker.c                             |    2 +-
 src/or/cpuworker.h                             |    2 +-
 src/or/directory.c                             |   62 ++-
 src/or/directory.h                             |    2 +-
 src/or/dirserv.c                               |   32 +-
 src/or/dirserv.h                               |    2 +-
 src/or/dirvote.c                               |   12 +-
 src/or/dirvote.h                               |   34 +-
 src/or/dns.c                                   |    2 +-
 src/or/dns.h                                   |    2 +-
 src/or/dnsserv.c                               |    2 +-
 src/or/dnsserv.h                               |    2 +-
 src/or/entrynodes.c                            |    4 +-
 src/or/entrynodes.h                            |    2 +-
 src/or/eventdns_tor.h                          |    2 +-
 src/or/ext_orport.c                            |    2 +-
 src/or/ext_orport.h                            |    2 +-
 src/or/fp_pair.c                               |    2 +-
 src/or/fp_pair.h                               |    2 +-
 src/or/geoip.c                                 |    2 +-
 src/or/geoip.h                                 |    2 +-
 src/or/hibernate.c                             |    2 +-
 src/or/hibernate.h                             |    2 +-
 src/or/include.am                              |    7 +-
 src/or/main.c                                  |   55 ++-
 src/or/main.h                                  |    2 +-
 src/or/microdesc.c                             |    2 +-
 src/or/microdesc.h                             |    2 +-
 src/or/networkstatus.c                         |   15 +-
 src/or/networkstatus.h                         |    2 +-
 src/or/nodelist.c                              |  233 ++++++++--
 src/or/nodelist.h                              |   32 +-
 src/or/ntmain.c                                |    2 +-
 src/or/ntmain.h                                |    2 +-
 src/or/onion.c                                 |    2 +-
 src/or/onion.h                                 |    2 +-
 src/or/onion_fast.c                            |    2 +-
 src/or/onion_fast.h                            |    2 +-
 src/or/onion_ntor.c                            |    2 +-
 src/or/onion_ntor.h                            |    2 +-
 src/or/onion_tap.c                             |    2 +-
 src/or/onion_tap.h                             |    2 +-
 src/or/or.h                                    |   25 +-
 src/or/policies.c                              |   38 +-
 src/or/policies.h                              |    2 +-
 src/or/reasons.c                               |    2 +-
 src/or/reasons.h                               |    2 +-
 src/or/relay.c                                 |   26 +-
 src/or/relay.h                                 |    4 +-
 src/or/rendclient.c                            |    2 +-
 src/or/rendclient.h                            |    2 +-
 src/or/rendcommon.c                            |   15 +-
 src/or/rendcommon.h                            |    2 +-
 src/or/rendmid.c                               |    9 +-
 src/or/rendmid.h                               |    2 +-
 src/or/rendservice.c                           |   13 +-
 src/or/rendservice.h                           |    8 +-
 src/or/rephist.c                               |  222 ++++++++-
 src/or/rephist.h                               |    9 +-
 src/or/replaycache.c                           |    2 +-
 src/or/replaycache.h                           |    2 +-
 src/or/router.c                                |   20 +-
 src/or/router.h                                |    2 +-
 src/or/routerlist.c                            |   24 +-
 src/or/routerlist.h                            |    2 +-
 src/or/routerparse.c                           |   82 ++--
 src/or/routerparse.h                           |    5 +-
 src/or/routerset.c                             |    2 +-
 src/or/routerset.h                             |    2 +-
 src/or/scheduler.c                             |    6 +-
 src/or/scheduler.h                             |    2 +-
 src/or/statefile.c                             |    2 +-
 src/or/statefile.h                             |    2 +-
 src/or/status.c                                |    2 +-
 src/or/status.h                                |    2 +-
 src/or/tor_main.c                              |    2 +-
 src/or/transports.c                            |    6 +-
 src/or/transports.h                            |    4 +-
 src/test/bench.c                               |    2 +-
 src/test/bt_test.py                            |    2 +-
 src/test/ed25519_exts_ref.py                   |    2 +-
 src/test/fakechans.h                           |    3 +-
 src/test/include.am                            |    6 +-
 src/test/ntor_ref.py                           |    2 +-
 src/test/test-child.c                          |    2 +-
 src/test/test.c                                |   14 +-
 src/test/test.h                                |    2 +-
 src/test/test_addr.c                           |    2 +-
 src/test/test_bt_cl.c                          |    2 +-
 src/test/test_buffers.c                        |    6 +-
 src/test/test_cell_formats.c                   |    2 +-
 src/test/test_cell_queue.c                     |    2 +-
 src/test/test_channel.c                        |   70 ++-
 src/test/test_channeltls.c                     |    9 +-
 src/test/test_checkdir.c                       |    2 +-
 src/test/test_circuitlist.c                    |    2 +-
 src/test/test_circuitmux.c                     |    2 +-
 src/test/test_cmdline_args.py                  |    6 +-
 src/test/test_config.c                         |  593 +++++++++++++++++++++++-
 src/test/test_containers.c                     |    2 +-
 src/test/test_controller_events.c              |    2 +-
 src/test/test_crypto.c                         |    2 +-
 src/test/test_data.c                           |    2 +-
 src/test/test_dir.c                            |   59 ++-
 src/test/test_entrynodes.c                     |    2 +-
 src/test/test_extorport.c                      |    2 +-
 src/test/test_hs.c                             |    2 +-
 src/test/test_introduce.c                      |    2 +-
 src/test/test_logging.c                        |    2 +-
 src/test/test_microdesc.c                      |    5 +-
 src/test/test_nodelist.c                       |    2 +-
 src/test/test_ntor_cl.c                        |    2 +-
 src/test/test_oom.c                            |    2 +-
 src/test/test_options.c                        |    2 +-
 src/test/test_policy.c                         |    2 +-
 src/test/test_pt.c                             |    2 +-
 src/test/test_relay.c                          |   12 +-
 src/test/test_relaycell.c                      |    4 +-
 src/test/test_replay.c                         |    2 +-
 src/test/test_routerkeys.c                     |    2 +-
 src/test/test_scheduler.c                      |    2 +-
 src/test/test_socks.c                          |    2 +-
 src/test/test_util.c                           |   75 ++-
 src/tools/tor-checkkey.c                       |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper-natpmp.c |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper-natpmp.h |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper-upnp.c   |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper-upnp.h   |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper.c        |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper.h        |    2 +-
 src/tools/tor-gencert.c                        |    2 +-
 src/tools/tor-resolve.c                        |    2 +-
 src/win32/orconfig.h                           |    2 +-
 277 files changed, 3315 insertions(+), 833 deletions(-)






More information about the tor-commits mailing list