[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 7bcbd49ad824c1c343d7b26ed58d75ce062cb54c
Merge: 25ccecd0f 7e7585d0a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:59:28 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26158 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)