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

[erinn at torproject.org]

commit 3356ab5dca3fc20981ad114e642a1bb61e535b92
Merge: 31c0e3c f764ddd
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Aug 27 07:29:09 2012 +0100

    Merge branch 'maint-2.3'

 build-scripts/linux.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)