[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/bug11683'
nickm at torproject.org
nickm at torproject.org
Thu Jun 19 17:16:44 UTC 2014
commit 922be84ca3eedddfcfd358a4728b7eb0405eb27b
Merge: c6e1080 5e9bd1b
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jun 19 10:42:19 2014 -0400
Merge remote-tracking branch 'karsten/bug11683'
changes/bug11683 | 6 ++++++
src/or/directory.c | 6 +++---
src/or/routerlist.c | 6 ++++--
3 files changed, 13 insertions(+), 5 deletions(-)
More information about the tor-commits
mailing list