[tor-commits] [tor/master] Merge remote-tracking branch 'teor/autodetect-chutney-path'

[nickm at torproject.org]

commit fe4273fdc1527a129f62242767d7d83b9fb7bcd2
Merge: 569368e d9948df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 2 09:17:24 2015 -0400

    Merge remote-tracking branch 'teor/autodetect-chutney-path'

 Makefile.am                     |   11 ++++++++---
 changes/autodetect-chutney-path |    4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)