commit 21abfb71bf6f5ca6c4c9581dc3504cbd42e47262 Merge: 3e3b5f3 d1adf37 Author: Erinn Clark <[email protected]> Date: Fri Jan 4 15:34:17 2013 +0100
Merge branch 'maint-2.3' into maint-2.4
build-scripts/linux.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
