commit 8aa04408fb724d55e95419ec9f0568c7d733acb5 Merge: 6c7720e 2b27ce5 Author: Nick Mathewson <[email protected]> Date: Wed May 13 11:03:05 2015 -0400
Merge branch 'bug15823_025' into maint-0.2.5
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
