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

[nickm at torproject.org]

commit fe2a9cb3894fc59e812fe0c9cb18a7fe81a6cdb8
Merge: 402f4bc 0f97f96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 11:19:03 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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