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

[nickm at torproject.org]

commit 115dd554c5d0126c1b006f283f6411733b3a70b1
Merge: c8024b6 08e8c21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 26 09:41:30 2015 -0400

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

 changes/bug16164 |    4 ++++
 configure.ac     |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)