commit 5e7d505850607a16f6051a19ff60c39ff4c8393e Merge: b5a6c0399 5acfc3087 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 18:24:37 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
"ours" merge to avoid earlier version of 25629 fix.
tor-commits@lists.torproject.org