[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 6317aa2cc03a3b7a6f9fd4a4bdd99447f7914493
Merge: fa6eaab83 d416e208e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 28 07:50:47 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bugs_25036_25055 |  7 +++++
 src/common/util.c        | 72 ++++++++++++++++++++++++++++++++++++++----------
 src/common/util.h        |  3 +-
 src/or/proto_socks.c     |  4 +--
 src/test/test_socks.c    | 24 ++++++++++++++--
 src/test/test_util.c     | 68 +++++++++++++++++++++++++++++++--------------
 6 files changed, 138 insertions(+), 40 deletions(-)