commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark <er...@torproject.org> Date: Sat May 12 10:42:04 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
build-scripts/linux.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
