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

[nickm at torproject.org]

commit aaf748435cb6e42922bf5948b04b4679bbf649b1
Merge: efff55b 22a9127
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 29 12:49:59 2015 +0200

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

 ChangeLog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)