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

List:       tor-cvs
Subject:    [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
From:       nickm () torproject ! org
Date:       2014-08-29 20:46:01
Message-ID: 20140829204601.41C95281CF () cupani ! torproject ! org
[Download RAW message or body]

commit f113a263deda8e1619f46cd913fc24ac28da832d
Merge: d6fa823 41058dc
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri Aug 29 16:45:56 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5'

 changes/bug12996   |    5 +++++
 src/or/onion_tap.c |    5 +++--
 2 files changed, 8 insertions(+), 2 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]