commit 5c6a601323e817cbd8e2922053c4d7086459b016
Merge: 1614e00 f6afd4e
Author: Roger Dingledine <[email protected]>
Date: Mon Apr 23 03:39:02 2012 -0400
Merge branch 'maint-0.2.2' into release-0.2.2
changes/bug5644 | 5 +++++
changes/bug5647 | 4 ++++
src/or/rendservice.c | 14 +++++++-------
src/or/routerparse.c | 3 +--
4 files changed, 17 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
