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

[nickm@xxxxxxxxxxxxxx]

commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa
Merge: 7e7585d0a 340fcc7e2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Jun 17 19:24:48 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 .editorconfig | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits