[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit 3d8a045bd6b9395c108cfbdfd971690163ca0e21
Merge: 551dba3 216a9f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 29 10:12:05 2015 +0200

    Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17151      |    7 +++++++
 changes/bug17154      |    3 +++
 configure.ac          |    1 +
 src/or/include.am     |    4 ++--
 src/test/test_bt.sh   |    1 +
 src/test/test_bt_cl.c |   11 ++++++++++-
 6 files changed, 24 insertions(+), 3 deletions(-)