commit dad35227127994847e81d9bee66fb9d0b988267d Merge: 407441c 614d9bc Author: Nick Mathewson <[email protected]> Date: Wed May 13 11:05:50 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/bug15823 | 4 ++++
src/or/rendservice.c | 18 ++++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
