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

[nickm at torproject.org]

commit 5141360099158b35eee1e9287d2dbc2ac5e808ab
Merge: b9ad49844 d068f3359
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:53:38 2017 -0400

    Merge branch 'maint-0.3.1'

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