commit 9bcd93a3648f0c947520c54c9199786988f7c5c6
Merge: 8f793c3 761ee93
Author: Nick Mathewson <[email protected]>
Date: Thu Oct 31 14:43:20 2013 -0400
Merge remote-tracking branch 'public/bug10063'
src/or/circpathbias.c | 1537 ++++++++++++++++++++++++++++++++++++++++++++++
src/or/circpathbias.h | 29 +
src/or/circuitbuild.c | 1520 +--------------------------------------------
src/or/circuitbuild.h | 10 -
src/or/circuitlist.c | 1 +
src/or/circuituse.c | 1 +
src/or/connection_edge.c | 1 +
src/or/entrynodes.c | 1 +
src/or/include.am | 2 +
src/or/relay.c | 1 +
src/or/rendclient.c | 1 +
src/or/rendservice.c | 1 +
12 files changed, 1576 insertions(+), 1529 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
