[tor-commits] [tor/master] Merge remote-tracking branch 'public/feature4994-rebased'

nickm at torproject.org nickm at torproject.org
Fri Feb 15 21:04:00 UTC 2013


commit 0fa362cafa49bf8e7914a1bad0a76a64baef3a84
Merge: 6c8b6e9 d7089ff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 15 15:58:54 2013 -0500

    Merge remote-tracking branch 'public/feature4994-rebased'

 changes/feature4994   |    7 +++++
 src/or/circuitbuild.c |    1 +
 src/or/directory.c    |   11 ++++---
 src/or/entrynodes.c   |   69 ++++++++++++++++++++++++++++++++++---------------
 src/or/entrynodes.h   |    2 +-
 src/or/microdesc.c    |    4 +-
 6 files changed, 65 insertions(+), 29 deletions(-)



More information about the tor-commits mailing list