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

[nickm at torproject.org]

commit feee44577133e0f76add0ae9c03d2b722f05cbb8
Merge: 1bb1035 be0e262
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 16 11:11:48 2014 -0400

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

 changes/bug13151-client |   13 +++++++++++++
 src/or/rendclient.c     |    2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)