commit 203c7427a203db62ec8db7787e8468e7322065db Merge: 127a3cd 44f116b Author: Erinn Clark <[email protected]> Date: Wed Jun 6 19:44:48 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
build-scripts/linux.mk | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
