commit 6defb10d723211b5a0830a408bd33863fd33872f Merge: 0124b10 b933360 Author: Nick Mathewson <[email protected]> Date: Thu Apr 18 22:45:12 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8711 | 6 ++++++
src/or/dirserv.c | 9 +++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
