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

[erinn at torproject.org]

commit 0f92e656ff68514d21d01bb426b4e2b1ac83df88
Merge: f9919a1 4d1bbc9
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Aug 13 23:09:31 2012 +0100

    Merge branch 'maint-2.3'

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