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

[nickm at torproject.org]

commit 4bb287aa39d74e99dc319cd0a3fde88419340848
Merge: a7e777ab8 703ab95e9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 27 09:09:34 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bastet_v6 | 4 ++++
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)