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

[nickm at torproject.org]

commit ec29cae8d7e97d652a87d753d93e4289e5a0ed26
Merge: c73b35d 1ea155b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 13 16:52:20 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22520    | 5 +++++
 src/common/compat.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)