[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
commit 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9
Merge: ec97319 bd28322
Author: Andrea Shepard <andrea@xxxxxxxxxxxxxxxxxxx>
Date: Wed Oct 10 18:53:38 2012 -0700
Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
changes/bug6465 | 12 +
changes/bug6816 | 6 +
src/common/crypto.c | 6 +-
src/common/log.c | 2 +-
src/common/torlog.h | 4 +-
src/or/Makefile.nmake | 14 +-
src/or/channel.c | 4086 ++++++++++++++++++++++++++++++++++++++++++++++
src/or/channel.h | 471 ++++++
src/or/channeltls.c | 1894 +++++++++++++++++++++
src/or/channeltls.h | 57 +
src/or/circuitbuild.c | 181 ++-
src/or/circuitbuild.h | 2 +-
src/or/circuitlist.c | 518 ++++---
src/or/circuitlist.h | 28 +-
src/or/circuitmux.c | 1745 ++++++++++++++++++++
src/or/circuitmux.h | 136 ++
src/or/circuitmux_ewma.c | 683 ++++++++
src/or/circuitmux_ewma.h | 29 +
src/or/circuituse.c | 39 +-
src/or/command.c | 1047 ++-----------
src/or/command.h | 8 +-
src/or/config.c | 12 +
src/or/connection.c | 84 +-
src/or/connection_edge.c | 53 +-
src/or/connection_or.c | 562 ++++---
src/or/connection_or.h | 14 +-
src/or/control.c | 10 +-
src/or/cpuworker.c | 37 +-
src/or/directory.c | 8 +-
src/or/dirserv.c | 10 +-
src/or/geoip.c | 6 +-
src/or/include.am | 8 +
src/or/main.c | 42 +-
src/or/networkstatus.c | 17 +-
src/or/onion.c | 2 +-
src/or/or.h | 307 +++--
src/or/reasons.c | 4 +-
src/or/relay.c | 681 ++------
src/or/relay.h | 20 +-
src/or/rendmid.c | 8 +-
src/or/router.h | 11 +-
41 files changed, 10607 insertions(+), 2257 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits