[tor-commits] [tor/master] Merge branch 'rename_log_7599'

[nickm@xxxxxxxxxxxxxx]

commit ec90ed4f6d1155d28fde91097e76f574195583c6
Merge: fd49226 7301339
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 1 16:23:26 2013 -0500

    Merge branch 'rename_log_7599'

 changes/rename_log_7599      |    4 ++
 src/common/address.c         |    4 +-
 src/common/compat_libevent.c |   18 +++---
 src/common/crypto.c          |   11 ++--
 src/common/procmon.c         |    2 +-
 src/common/torlog.h          |    1 -
 src/common/tortls.c          |   20 ++++----
 src/common/util.c            |    5 +-
 src/ext/eventdns.c           |  112 +++++++++++++++++++++---------------------
 src/or/buffers.c             |    6 +-
 src/or/channel.c             |   66 ++++++++++++------------
 src/or/circuitlist.c         |   10 ++--
 src/or/config.c              |   36 +++++++-------
 src/or/connection.c          |   10 ++--
 src/or/connection_or.c       |    4 +-
 src/or/control.c             |    2 +-
 src/or/directory.c           |    2 +-
 src/or/dirserv.c             |    2 +-
 src/or/dirvote.c             |    2 +-
 src/or/dns.c                 |   16 +++---
 src/or/main.c                |   34 ++++++------
 src/or/networkstatus.c       |    8 ++--
 src/or/nodelist.c            |    4 +-
 src/or/policies.c            |    4 +-
 src/or/relay.c               |    5 +-
 src/or/rendservice.c         |    6 +-
 src/or/rephist.c             |    8 ++--
 src/or/router.c              |   46 +++++++++---------
 src/or/routerlist.c          |    2 +-
 src/or/routerparse.c         |    2 +-
 src/or/routerset.c           |    2 +-
 src/or/status.c              |    2 +-
 src/test/test_util.c         |   16 ++++++
 src/tools/tor-gencert.c      |    7 ++-
 34 files changed, 250 insertions(+), 229 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits