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

[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/task-9854-2'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'karsten/task-9854-2'
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 9 Oct 2013 16:36:29 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 09 Oct 2013 12:36:41 -0400
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 bcde4cc4cf521c8e125e95cdd793aa499d1a36c7
Merge: 0e3cf3e 795c0f7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 9 12:36:24 2013 -0400

    Merge remote-tracking branch 'karsten/task-9854-2'

 src/config/torrc.sample.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

_______________________________________________
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 'origin/maint-0.2.4'
Next by Author: [tor-commits] [tor/master] Update last modified timestamp of torrc.sample.in.
Previous by thread: [tor-commits] [tor/master] Partially revert "Clarify who learns about ContactInfo."
Next by thread: [tor-commits] [tor/master] Update last modified timestamp of torrc.sample.in.
Index(es):
- Author
- Thread