commit b3f24b5de37299d0db87ad8dd2138615ded94e66
Merge: db769b6 929a8f1
Author: Nick Mathewson <[email protected]>
Date: Fri Apr 3 09:52:57 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
changes/bug11447 | 5 +++++
changes/bug15515 | 4 ++++
src/or/or.h | 3 +++
src/or/rendmid.c | 14 ++++++++++++++
src/or/rendservice.c | 2 +-
5 files changed, 27 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
