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

[nickm at torproject.org]

commit 8a15d0f69b6490eb525cdd889b3a905ad0db5e39
Merge: c292e505f feb41b7c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 26 17:25:28 2018 -0500

    Merge branch 'maint-0.3.5'

 changes/bug28096       | 13 +++++++
 src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++----------------
 2 files changed, 77 insertions(+), 31 deletions(-)