commit 0b004ba5c0c00b9d367b5a1e305f9e4e9adc65b6 Merge: 396ac67 be0e262 Author: Roger Dingledine <a...@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(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
