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

[nickm at torproject.org]

commit eaa8224cef25c1fb27b5f2ef14f836325439f10e
Merge: d4f87073a 2b26815e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 11 17:49:18 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22446 | 4 ++++
 1 file changed, 4 insertions(+)