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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 26 Mar 2012 18:03:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 26 Mar 2012 14:03:19 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: 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-bounces@xxxxxxxxxxxxxxxxxxxx

commit 2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a
Merge: e103509 ec1bc8a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 26 13:57:51 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	changes/bug5090
    
    bug5090 was already merged and corrected in the master branch's changelog.

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

Prev by Author: [tor-commits] [tor/master] Use a given name in the bug5090 message, at its holder's request.
Next by Author: [tor-commits] [tor/master] Add a sha256 hmac function, with tests
Previous by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
Index(es):
- Author
- Thread