commit a201a5396e9aef779386216e2a21bfeb75d3d9c6
Merge: 24352d0 0475552
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Apr 6 09:26:28 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6'
changes/bug15600 | 5 +++++
changes/bug15601 | 4 ++++
src/or/rendcommon.c | 2 +-
src/or/rendservice.c | 10 ++++++++++
src/or/routerparse.c | 14 +++++++++-----
5 files changed, 29 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
