[tor-commits] [tor/master] Merge branch 'refactor_buffers_api_3'

[nickm@xxxxxxxxxxxxxx]

commit 4bac93ba5d2ba054d935f1f58fa52c820ebb5b20
Merge: babe31fc7 6ec505972
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 5 14:04:03 2017 -0400

    Merge branch 'refactor_buffers_api_3'

 changes/refactor-buffer        |    3 +
 src/common/buffers.c           | 1069 +++++++++++++++++++
 src/{or => common}/buffers.h   |   83 +-
 src/common/buffers_tls.c       |  175 ++++
 src/common/buffers_tls.h       |   19 +
 src/common/include.am          |    4 +
 src/or/buffers.c               | 2214 ----------------------------------------
 src/or/channeltls.c            |    2 +-
 src/or/connection.c            |   64 +-
 src/or/connection.h            |   12 +-
 src/or/connection_edge.c       |   11 +-
 src/or/connection_or.c         |    9 +-
 src/or/control.c               |   20 +-
 src/or/directory.c             |   36 +-
 src/or/dirserv.c               |   10 +-
 src/or/ext_orport.c            |   21 +-
 src/or/include.am              |   12 +-
 src/or/main.c                  |    8 +-
 src/or/or.h                    |   14 +-
 src/or/proto_cell.c            |   83 ++
 src/or/proto_cell.h            |   17 +
 src/or/proto_control0.c        |   26 +
 src/or/proto_control0.h        |   14 +
 src/or/proto_ext_or.c          |   40 +
 src/or/proto_ext_or.h          |   17 +
 src/or/proto_http.c            |  171 ++++
 src/or/proto_http.h            |   24 +
 src/or/proto_socks.c           |  698 +++++++++++++
 src/or/proto_socks.h           |   20 +
 src/or/relay.c                 |    8 +-
 src/test/test_buffers.c        |  225 ++--
 src/test/test_dir_handle_get.c |    1 +
 src/test/test_extorport.c      |    8 +-
 src/test/test_helpers.c        |    2 +-
 src/test/test_hs_cache.c       |    1 +
 src/test/test_oom.c            |    2 +-
 src/test/test_socks.c          |    3 +-
 37 files changed, 2676 insertions(+), 2470 deletions(-)



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