commit 614d9bc9674cfb7807b0423bb43fc1c184501144
Merge: 26c344a 8aa0440
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed May 13 11:05:33 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
changes/bug15823 | 4 ++++
src/or/rendservice.c | 18 ++++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
