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

[nickm at torproject.org]

commit 7286a27cfc74ca81ed71a8579ded95b25564708a
Merge: 6ed5733 26c344a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 28 14:46:53 2015 -0400

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

 changes/bug15850 |    4 ++++
 src/or/dirserv.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)