[tor-commits] [chutney/master] Merge remote-tracking branch 'teor/issue-13161-template-tweaks'

[nickm at torproject.org]

commit a87ac53a061ccbbfdb70d539407a14f0f3c48730
Merge: d91cf28 a2de38a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 13 18:18:14 2014 -0400

    Merge remote-tracking branch 'teor/issue-13161-template-tweaks'

 networks/bridges      |    2 +-
 networks/bridges+ipv6 |    2 +-
 networks/mixed        |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)