commit cd1c974ac109e33a14f9c268620d71c3cf5cf913 Merge: a35e35e b328684 Author: Erinn Clark erinn@torproject.org Date: Tue May 7 20:11:32 2013 -0300

Merge branch 'maint-2.4'

build-scripts/config/Info.plist-stable | 44 ++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)