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

[nickm at torproject.org]

commit 0ed966fde111a892e3d0010cea3fd165b0c7972f
Merge: d890ec29a 694e3c57f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 9 09:38:27 2019 -0500

    Merge branch 'maint-0.3.5'

 changes/bug28995         | 5 +++++
 src/lib/net/socketpair.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)