[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm@xxxxxxxxxxxxxx]

commit 8517e2d6e9cf1500a1cb531c3bcf49004045989e
Merge: 60bc9675d fe1fb4b0c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 15 17:08:34 2018 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/ticket25573       |   5 +
 src/common/container.c    |   2 +-
 src/common/container.h    |   2 +-
 src/or/circpathbias.c     |  63 +++++
 src/or/circpathbias.h     |   1 +
 src/or/circuitbuild.c     |   3 +-
 src/or/circuitbuild.h     |   3 +-
 src/or/circuitlist.c      |  25 +-
 src/or/connection_edge.c  | 241 +++++++++++++++++
 src/or/connection_edge.h  |  23 +-
 src/or/or.h               |  25 ++
 src/or/relay.c            |  77 +++++-
 src/test/test_relaycell.c | 641 ++++++++++++++++++++++++++++++++++++++++++----
 13 files changed, 1057 insertions(+), 54 deletions(-)

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