[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1'

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