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

[erinn at torproject.org]

commit 919aae17d041391fecf094dd8c4b7544235522a2
Merge: b8669ef 0bf043f
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Sep 21 14:06:27 2013 +0200

    Merge branch 'maint-2.4'

 changelog.linux-2.4 |    1 +
 1 file changed, 1 insertion(+)