[tor-commits] [oonib/master] Merge pull request #6 from stephen-soltesz/master

commit 689022f45398b521767e7fd98ed6d2d7e4bc158e Merge: 7a205ca fd66dca Author: Arturo Filastò <hellais@gmail.com> Date: Thu Jun 6 10:20:58 2013 -0700 Merge pull request #6 from stephen-soltesz/master update zlib to 1.2.8 b/c 1.2.7 is removed from zlib.net scripts/build_tor2web_tor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)