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

[nickm at torproject.org]

commit c9a3525c7012cd2f58ad41cac82b767d322e8a34
Merge: e5cf65e8e 30b322925
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 27 09:09:34 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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