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

commit 8d300c48e77ae995e09f8c5de45a1ebd4a960536 Merge: 32858610c 586c327e0 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 18 14:40:50 2017 -0400 Merge branch 'maint-0.3.1' "ours" to avoid version bump.