commit 830b659fedf52ad81554328a0601a5502a8ea72f Merge: 7db07d674 694e3c57f Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 9 09:38:27 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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