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

[nickm at torproject.org]

commit 0f97f963e3c267852a3f28538c5ddb196ce0bb42
Merge: e88aa98 8bc70a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 11:19:03 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22801  |  5 +++++
 src/common/util.c | 12 ++++++++++++
 2 files changed, 17 insertions(+)