[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'public/decouple_conn_attach_2'
commit 118bdc3a6ddf14f89f77853078ab4c7cf24f8d94
Merge: 913fbf8 58edf92
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu Nov 19 10:44:31 2015 -0500
Merge remote-tracking branch 'public/decouple_conn_attach_2'
changes/decouple_conn_attach | 6 ++
src/or/circuituse.c | 8 +--
src/or/connection_edge.c | 162 ++++++++++++++++++++++++++++++++++++------
src/or/connection_edge.h | 6 +-
src/or/main.c | 6 ++
src/or/rendclient.c | 11 +--
6 files changed, 165 insertions(+), 34 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits