[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
From: nickm@xxxxxxxxxxxxxx
Date: Sun, 18 Jan 2015 18:50:22 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 18 Jan 2015 13:50:40 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit dcf8cddab25e5b189eaebf473423c2b31acb4525
Merge: bbad23b ba17cdf
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Jan 18 13:49:04 2015 -0500

    Merge remote-tracking branch 'origin/maint-0.2.5'
    
    Conflicts:
    	src/test/test_relaycell.c
    	src/test/test_util.c




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12485'
Next by Author: [tor-commits] [tor/master] Turn entry_guards_changed constants into symbolic constants
Previous by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
Index(es):
- Author
- Thread