commit 2d21a8f4d6f8b010f74d80c5abe969d3e0508460 Merge: 081ff5f 1badef5 Author: Nick Mathewson <ni...@torproject.org> Date: Thu May 15 13:35:08 2014 -0400
Merge remote-tracking branch 'public/bug11469_024'
changes/bug11469 | 6 ++++++
src/or/directory.c | 16 ++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
