commit dccbcc1314412c85efcb93a4b72e5174435deaa0 Merge: 61758f7 2a7b8a5 Author: Erinn Clark erinn@torproject.org Date: Thu May 3 09:31:50 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
build-scripts/linux.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
tor-commits@lists.torproject.org