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

[nickm at torproject.org]

commit e3caad0ea1fedd8d13b6772d0f848a5dd417bf12
Merge: b719fa7ef eaa8224ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 11 17:49:18 2017 -0400

    Merge branch 'maint-0.3.1'

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