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

commit 79f8641ee598cddbf8e67748cb0d02d9a7e7bf3e Merge: 7e406ec40 ac93c911c Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 12:45:30 2018 -0400

Merge branch 'nss_countbytes_squashed'

src/lib/tls/.may_include | 1 + src/lib/tls/include.am | 2 + src/lib/tls/nss_countbytes.c | 244 +++++++++++++++++++++++++++++++++++++++++++ src/lib/tls/nss_countbytes.h | 25 +++++ src/lib/tls/tortls_nss.c | 33 +++--- src/lib/tls/tortls_st.h | 5 +- 6 files changed, 296 insertions(+), 14 deletions(-)