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

[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbrowser/master] Merge branch 'maint-2.4'
From: erinn@xxxxxxxxxxxxxx
Date: Thu, 8 Aug 2013 13:21:28 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 08 Aug 2013 09:21:45 -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: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit e3d5bf421a65a08744b6ecad05ffab7272e59cfe
Merge: 643f11b e69b433
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Thu Aug 8 15:21:20 2013 +0200

    Merge branch 'maint-2.4'

 build-scripts/linux-alpha.mk |    2 +-
 build-scripts/linux.mk       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

Prev by Author: [tor-commits] [torbrowser/master] update libz version in linux makefiles
Next by Author: [tor-commits] [torbrowser/master] add the locale pref back to pound_tor.js. we need it for langpacks to work.
Previous by thread: [tor-commits] [torbrowser/master] Merge branch 'maint-2.4'
Next by thread: [tor-commits] [torbrowser/master] Merge branch 'maint-2.4'
Index(es):
- Author
- Thread