[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tor-cvs
Subject:    [tor-commits] [tor/master] Merge remote-tracking branch 'linus/enh6876_2'
From:       nickm () torproject ! org
Date:       2012-09-28 16:03:45
Message-ID: 20120928160345.D519823480 () cupani ! torproject ! org
[Download RAW message or body]

commit 5f494a363a725951af884882a472ff4ab2b0a6db
Merge: 95d9f7e 1cbf45b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri Sep 28 11:57:36 2012 -0400

    Merge remote-tracking branch 'linus/enh6876_2'

 doc/tor.1.txt       |    6 +++-
 src/or/config.c     |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/or/connection.c |   45 +++++++++++++++++++++-------------
 src/or/or.h         |    6 ++++-
 4 files changed, 103 insertions(+), 21 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[prev in list] [next in list] [prev in thread] [next in thread]