commit bfae41328e9bbd29a3c3df2cd6b7c5d0caf83ada Merge: f71d63e 84bf8e3 Author: Nick Mathewson <[email protected]> Date: Wed Dec 28 16:52:31 2011 -0500
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug4788 | 6 ++++++
src/or/dirserv.c | 23 ++++++++++++-----------
2 files changed, 18 insertions(+), 11 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
