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

[nickm at torproject.org]

commit be0e26272b3e795b902394acc9b66642fcdc1f21
Merge: 550c033 0c3b365
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 16 11:10:02 2014 -0400

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

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