[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

commit 0b004ba5c0c00b9d367b5a1e305f9e4e9adc65b6 Merge: 396ac67 be0e262 Author: Roger Dingledine <arma@torproject.org> Date: Fri Sep 19 21:44:23 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)