[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit 3153c272630510ee56c6797d75b7bf94d1681abc
Merge: fc591870b feb41b7c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 26 17:27:36 2018 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

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