commit feb41b7c3078d6df7e93a056853badc847773d9a Merge: 056ffdec4 44ced9b75 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 26 17:24:41 2018 -0500 Merge remote-tracking branch 'teor/bug28096-035-squashed' into maint-0.3.5 changes/bug28096 | 13 +++++++ src/lib/osinfo/uname.c | 95 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 77 insertions(+), 31 deletions(-)