[tor-commits] [tor/master] Merge branch 'bug25573-034-typefix' into maint-0.3.4

[nickm@xxxxxxxxxxxxxx]

commit 80a6228aacc9083fae07d4373d9c41017420e6b9
Merge: 15e752e6b 6d33f6563
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 15 16:58:16 2018 -0500

    Merge branch 'bug25573-034-typefix' into maint-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      |   8 +
 src/or/connection_edge.c  | 220 ++++++++++++++++
 src/or/connection_edge.h  |  17 ++
 src/or/or.h               |  25 ++
 src/or/relay.c            |  75 +++++-
 src/test/test_relaycell.c | 641 ++++++++++++++++++++++++++++++++++++++++++----
 13 files changed, 1014 insertions(+), 51 deletions(-)




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