commit f1431f439350948f2ec44e23d17d80de5aca9259 Merge: 4db33ecc0 d068f3359 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 26 12:53:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22915 | 3 +++ src/common/util.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)