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

[nickm at torproject.org]

commit d068f3359f86f5f0d5df693e8e0377d0d45540d4
Merge: 52c1754ff 3c017e823
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:53:38 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22915  |  3 +++
 src/common/util.c | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)