October 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] firefox 10.0.9esr is out
by erinn＠torproject.org 12 Oct '12

12 Oct '12

commit cb980b0e0657292b0ddefb1a297a21cd8bc37bd4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 12 11:32:57 2012 +0100 firefox 10.0.9esr is out --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 278d515..6063f66 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.2.39 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.8esr +FIREFOX_VER=10.0.9esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3

1 0

[torbrowser/master] firefox 10.0.9esr is out
by erinn＠torproject.org 12 Oct '12

12 Oct '12

commit cb980b0e0657292b0ddefb1a297a21cd8bc37bd4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 12 11:32:57 2012 +0100 firefox 10.0.9esr is out --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 278d515..6063f66 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,7 +10,7 @@ VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.2.39 PIDGIN_VER=2.6.4 -FIREFOX_VER=10.0.8esr +FIREFOX_VER=10.0.9esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Oct '12

12 Oct '12

commit 27f13b373d35e142b21fca27a8d96d5b5133d95c Merge: b910e7f cb980b0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 12 11:33:13 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 12 Oct '12

12 Oct '12

commit aad86fb89edf945c6a5a82c290553a763dc8fd3b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 03:15:09 2012 +0000 Update translations for vidalia --- ko_KR/vidalia_ko_KR.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ko_KR/vidalia_ko_KR.po b/ko_KR/vidalia_ko_KR.po index 357aae6..2c8884f 100644 --- a/ko_KR/vidalia_ko_KR.po +++ b/ko_KR/vidalia_ko_KR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-10-12 02:44+0000\n" +"PO-Revision-Date: 2012-10-12 02:46+0000\n" "Last-Translator: SpicaRS <SpicaRS(a)live.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3164,7 +3164,7 @@ msgstr "" msgctxt "ServicePage" msgid "Directory already in use by another service." -msgstr "" +msgstr "이 경로는 이미 다른 서비스가 쓰고 있어요." msgctxt "ServicePage" msgid "Form" @@ -3188,7 +3188,7 @@ msgstr "목표" msgctxt "ServicePage" msgid "Directory Path" -msgstr "" +msgstr "경로 위치" msgctxt "ServicePage" msgid "Enabled"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 12 Oct '12

12 Oct '12

commit 07f7ca59598002cc40546784e2c81883b6b5b3bd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 02:45:11 2012 +0000 Update translations for vidalia --- ko_KR/vidalia_ko_KR.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ko_KR/vidalia_ko_KR.po b/ko_KR/vidalia_ko_KR.po index afa1bd0..357aae6 100644 --- a/ko_KR/vidalia_ko_KR.po +++ b/ko_KR/vidalia_ko_KR.po @@ -3,20 +3,20 @@ # <contact(a)imfast.kr>, 2011. # <cwt967(a)naver.com>, 2011. # <siwoochung(a)me.com>, 2012. -# <SpicaRS(a)live.com>, 2011. +# <SpicaRS(a)live.com>, 2011-2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-07-30 15:06+0000\n" -"Last-Translator: chungsiwoo <siwoochung(a)me.com>\n" +"PO-Revision-Date: 2012-10-12 02:44+0000\n" +"Last-Translator: SpicaRS <SpicaRS(a)live.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ko_KR\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -3465,7 +3465,7 @@ msgstr "" msgctxt "Stream" msgid "Resolving" -msgstr "" +msgstr "해결하고 있음" msgctxt "Stream" msgid "Connecting" @@ -3481,11 +3481,11 @@ msgstr "실패" msgctxt "Stream" msgid "Closed" -msgstr "" +msgstr "끊김" msgctxt "Stream" msgid "Retrying" -msgstr "" +msgstr "다시 해 보는 중" msgctxt "Stream" msgid "Remapped" @@ -3497,7 +3497,7 @@ msgstr "알 수 없음" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" -msgstr "" +msgstr "프로세스 %1을 끄지 못했어요. [%2]" msgctxt "TorService" msgid "The Tor service is not installed."

1 0

[ooni-probe/master] * Moved /bin/oonicli back to /bin/ooniprobe, and the script to start the old
by isis＠torproject.org 12 Oct '12

12 Oct '12

commit 80ee58aeffafd75f7f13180045feece471e75217 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 12 00:12:11 2012 +0000 * Moved /bin/oonicli back to /bin/ooniprobe, and the script to start the old ooniprobe.py is now at /bin/old_ooniprobe. It seems less confusing that way. --- bin/oonicli | 28 ----------------- bin/ooniprobe | 94 +++++++++++++-------------------------------------------- 2 files changed, 21 insertions(+), 101 deletions(-) diff --git a/bin/oonicli b/bin/oonicli deleted file mode 100755 index 1e73c85..0000000 --- a/bin/oonicli +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8 -*- -############################################################################### -# -# oonicli -# ----------------------- -# -# Run the Twisted Trial (unittest module) based oonicli. Startup script based -# on twisted trial, see http://twistedmatrix.com/ . -# -# :authors: Arturo Filastò -# :licence: see included LICENSE file -# :version: 0.0.1-pre-alpha -############################################################################### - -import os, sys -import copy_reg - -# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - -# This is a hack to overcome a bug in python -from ooni.utils.hacks import patched_reduce_ex -copy_reg._reduce_ex = patched_reduce_ex - -from ooni.oonicli import run -run() diff --git a/bin/ooniprobe b/bin/ooniprobe index e234587..1e73c85 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -1,80 +1,28 @@ -#!/bin/bash -############################################################################## +#!/usr/bin/env python +# -*- encoding: utf-8 -*- +############################################################################### # -# ooniprobe -# ------------------- -# Setup environment variables and launch /ooni/ooniprobe.py without -# installing. +# oonicli +# ----------------------- # -#----------------------------------------------------------------------------- -# :authors: Isis Lovecruft, Arturo Filasto -# :license: see included LICENSE file -# :version: 0.0.1-pre-alpha +# Run the Twisted Trial (unittest module) based oonicli. Startup script based +# on twisted trial, see http://twistedmatrix.com/ . # -############################################################################## - -OONI_EXEC="ooniprobe.py" -#OONI_EXEC="oonicli.py" -OONI_PROCESS_NAME=$(echo $OONI_EXEC | sed s/\.py//) - -OONI_SCRIPT_IS_HERE=$(dirname ${BASH_SOURCE[0]}) -OONI_BIN="$(cd $OONI_SCRIPT_IS_HERE && pwd)" -OONI_REPO="$(cd $OONI_BIN"/.." && pwd)" -OONI_DIR="$OONI_REPO/ooni" - -OONI_PATH_ALREADY_SET=false - -function usage() { - echo "$0 - A simple wrapper around ooniprobe and oonicli to set" - echo "up environment variables, so that it can be run without installation." - echo; - echo "Usage: $0 [oonitest || file || script] [options]" - echo "All options and parameters are passed directly to ooniprobe, do" - echo "ooniprobe.py --help to see more." - echo; -} - -function check_pythonpath_for_ooni() { - pythonpaths="$(echo $PYTHONPATH | cut -d ':' -f '1-' --output-delimiter=' ')" - for dir in $pythonpaths; do - if [[ "x$dir" == "x$OONI_REPO" ]]; then - export OONI_PATH_ALREADY_SET=true - else - continue - fi - done -} +# :authors: Arturo Filastò +# :licence: see included LICENSE file +# :version: 0.0.1-pre-alpha +############################################################################### -function add_ooni_to_pythonpath() { - if test ! $OONI_PATH_ALREADY_SET ; then - echo "Appending $OONI_REPO to PYTHONPATH..." - export PYTHONPATH=$PYTHONPATH:$OONI_REPO - fi -} +import os, sys +import copy_reg -function add_exec_dir_to_stack() { - cwd_ending=$(echo $(pwd) | awk -F/ '{print $NF}') - if [[ "x$cwd_ending" == "xooni" ]]; then - pushd $(pwd) 2&>/dev/null ## $(dirs -l -p -1) - else - pushd $OONI_DIR 2&>/dev/null - fi - export OONI_RUN_PATH="$(popd)/$OONI_EXEC" -} +# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. +sys.path[:] = map(os.path.abspath, sys.path) +sys.path.insert(0, os.path.abspath(os.getcwd())) -function run_ooni_in_background() { - ## :param $1: - ## The full path to the script to run, i.e. $OONI_RUN_PATH. - coproc $1 -} +# This is a hack to overcome a bug in python +from ooni.utils.hacks import patched_reduce_ex +copy_reg._reduce_ex = patched_reduce_ex -if [[ "x$#" == "x0" ]]; then - usage -else - check_pythonpath_for_ooni - add_ooni_to_pythonpath - add_exec_dir_to_stack - OONI_START_CMD="python "$OONI_DIR"/"$OONI_EXEC" $@" - #run_ooni_in_background $OONI_START_CMD - $($OONI_START_CMD) -fi +from ooni.oonicli import run +run()

1 0

[ooni-probe/master] * Fixed a bug where the logger printed double messages to stdout.
by isis＠torproject.org 12 Oct '12

12 Oct '12

commit 01c85af36fe59586119af437533878233b1bdffd Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Oct 8 01:29:06 2012 +0000 * Fixed a bug where the logger printed double messages to stdout. * Fixed a problem where the reactor wouldn't get started if legacyTests were used. --- ooni/ooniprobe.py | 7 ++----- ooni/runner.py | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index c19be5f..5793eee 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -103,8 +103,6 @@ def runTest(test, options, global_options, reactor=reactor): for x in wgen: worker.push(x) - return True - class Options(usage.Options): tests = plugoo.keys() subCommands = [] @@ -145,10 +143,9 @@ if __name__ == "__main__": config.parseOptions() if not config.subCommand: - #print "Error! No Test Specified." config.opt_help() sys.exit(1) - if runTest(config.subCommand, config.subOptions, config): - reactor.run() + runTest(config.subCommand, config.subOptions, config) + reactor.run() diff --git a/ooni/runner.py b/ooni/runner.py index ea8726f..656e73e 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -295,10 +295,7 @@ class ORunner(object): result.done() def run(self): - #log.start() - self.reporterFactory.options = self.options - for inputUnit in InputUnitFactory(self.inputs): self.runWithInputUnit(inputUnit)

1 0

[ooni-probe/master] * Moved /bin/ooniprobe start script to /bin/oonicli.
by isis＠torproject.org 12 Oct '12

12 Oct '12

commit 16983944cdb94a9dee09a377e000d5b23b5ac322 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 6 23:10:22 2012 +0000 * Moved /bin/ooniprobe start script to /bin/oonicli. * Added new /bin/ooniprobe start script to use the old ooniprobe.py for legacy tests. * Fixed a bug in ooniprobe.runTest where it returned too early. * Fixed the inputs parser in ooni.runner.adaptLegacyTest. --- bin/oonicli | 28 ++++++++++++++++ bin/ooniprobe | 89 +++++++++++++++++++++++++++++++++++++++++++--------- ooni/ooniprobe.py | 7 ++-- ooni/runner.py | 1 - 4 files changed, 105 insertions(+), 20 deletions(-) diff --git a/bin/oonicli b/bin/oonicli new file mode 100755 index 0000000..1e73c85 --- /dev/null +++ b/bin/oonicli @@ -0,0 +1,28 @@ +#!/usr/bin/env python +# -*- encoding: utf-8 -*- +############################################################################### +# +# oonicli +# ----------------------- +# +# Run the Twisted Trial (unittest module) based oonicli. Startup script based +# on twisted trial, see http://twistedmatrix.com/ . +# +# :authors: Arturo Filastò +# :licence: see included LICENSE file +# :version: 0.0.1-pre-alpha +############################################################################### + +import os, sys +import copy_reg + +# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. +sys.path[:] = map(os.path.abspath, sys.path) +sys.path.insert(0, os.path.abspath(os.getcwd())) + +# This is a hack to overcome a bug in python +from ooni.utils.hacks import patched_reduce_ex +copy_reg._reduce_ex = patched_reduce_ex + +from ooni.oonicli import run +run() diff --git a/bin/ooniprobe b/bin/ooniprobe index 4e400ce..e234587 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -1,23 +1,80 @@ -#!/usr/bin/env python -# -*- encoding: utf-8 -*- +#!/bin/bash +############################################################################## # -# startup script based on twisted trial -# See http://twistedmatrix.com/ +# ooniprobe +# ------------------- +# Setup environment variables and launch /ooni/ooniprobe.py without +# installing. # -# :authors: Arturo Filastò -# :licence: see LICENSE +#----------------------------------------------------------------------------- +# :authors: Isis Lovecruft, Arturo Filasto +# :license: see included LICENSE file +# :version: 0.0.1-pre-alpha +# +############################################################################## + +OONI_EXEC="ooniprobe.py" +#OONI_EXEC="oonicli.py" +OONI_PROCESS_NAME=$(echo $OONI_EXEC | sed s/\.py//) + +OONI_SCRIPT_IS_HERE=$(dirname ${BASH_SOURCE[0]}) +OONI_BIN="$(cd $OONI_SCRIPT_IS_HERE && pwd)" +OONI_REPO="$(cd $OONI_BIN"/.." && pwd)" +OONI_DIR="$OONI_REPO/ooni" + +OONI_PATH_ALREADY_SET=false + +function usage() { + echo "$0 - A simple wrapper around ooniprobe and oonicli to set" + echo "up environment variables, so that it can be run without installation." + echo; + echo "Usage: $0 [oonitest || file || script] [options]" + echo "All options and parameters are passed directly to ooniprobe, do" + echo "ooniprobe.py --help to see more." + echo; +} +function check_pythonpath_for_ooni() { + pythonpaths="$(echo $PYTHONPATH | cut -d ':' -f '1-' --output-delimiter=' ')" + for dir in $pythonpaths; do + if [[ "x$dir" == "x$OONI_REPO" ]]; then + export OONI_PATH_ALREADY_SET=true + else + continue + fi + done +} -import os, sys -import copy_reg +function add_ooni_to_pythonpath() { + if test ! $OONI_PATH_ALREADY_SET ; then + echo "Appending $OONI_REPO to PYTHONPATH..." + export PYTHONPATH=$PYTHONPATH:$OONI_REPO + fi +} -# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) +function add_exec_dir_to_stack() { + cwd_ending=$(echo $(pwd) | awk -F/ '{print $NF}') + if [[ "x$cwd_ending" == "xooni" ]]; then + pushd $(pwd) 2&>/dev/null ## $(dirs -l -p -1) + else + pushd $OONI_DIR 2&>/dev/null + fi + export OONI_RUN_PATH="$(popd)/$OONI_EXEC" +} -# This is a hack to overcome a bug in python -from ooni.utils.hacks import patched_reduce_ex -copy_reg._reduce_ex = patched_reduce_ex +function run_ooni_in_background() { + ## :param $1: + ## The full path to the script to run, i.e. $OONI_RUN_PATH. + coproc $1 +} -from ooni.oonicli import run -run() +if [[ "x$#" == "x0" ]]; then + usage +else + check_pythonpath_for_ooni + add_ooni_to_pythonpath + add_exec_dir_to_stack + OONI_START_CMD="python "$OONI_DIR"/"$OONI_EXEC" $@" + #run_ooni_in_background $OONI_START_CMD + $($OONI_START_CMD) +fi diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py old mode 100644 new mode 100755 index 2e23409..c19be5f --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -12,8 +12,9 @@ # The goal of ooni-probe is to collect data about censorship around # the world. # -# :copyright: (c) 2012 by Arturo Filastò +# :copyright: (c) 2012 by Arturo Filastò, Isis Lovecruft # :license: see LICENSE for more details. +# :version: 0.0.1-pre-alpha # import sys @@ -80,17 +81,17 @@ def runTest(test, options, global_options, reactor=reactor): log.start(log_to_stdout, global_options['log'], global_options['verbosity']) + resume = 0 if not options: options = {} - if 'resume' in options: resume = options['resume'] test = test_class(options, global_options, report, reactor=reactor) - if test.tool: test.runTool() + return True if test.ended: print "Ending test" diff --git a/ooni/runner.py b/ooni/runner.py index e4f31ba..ea8726f 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -161,7 +161,6 @@ def processTest(obj, config): options = Options() options.parseOptions(config['subArgs']) - obj.localOptions = options if inputFile:

1 0

[ooni-probe/master] * Added a startup script for running the old ooniprobe.py directly without
by isis＠torproject.org 11 Oct '12

11 Oct '12

commit 1d827ef0ae1ff4cd5236e60fecab05cfcaa4e464 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 11 22:59:32 2012 +0000 * Added a startup script for running the old ooniprobe.py directly without installing, including detecting our current working directory and dynamically adding the correct path to $PYTHONPATH, only if that path isn't present already. --- bin/old_ooniprobe | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/bin/old_ooniprobe b/bin/old_ooniprobe new file mode 100755 index 0000000..e234587 --- /dev/null +++ b/bin/old_ooniprobe @@ -0,0 +1,80 @@ +#!/bin/bash +############################################################################## +# +# ooniprobe +# ------------------- +# Setup environment variables and launch /ooni/ooniprobe.py without +# installing. +# +#----------------------------------------------------------------------------- +# :authors: Isis Lovecruft, Arturo Filasto +# :license: see included LICENSE file +# :version: 0.0.1-pre-alpha +# +############################################################################## + +OONI_EXEC="ooniprobe.py" +#OONI_EXEC="oonicli.py" +OONI_PROCESS_NAME=$(echo $OONI_EXEC | sed s/\.py//) + +OONI_SCRIPT_IS_HERE=$(dirname ${BASH_SOURCE[0]}) +OONI_BIN="$(cd $OONI_SCRIPT_IS_HERE && pwd)" +OONI_REPO="$(cd $OONI_BIN"/.." && pwd)" +OONI_DIR="$OONI_REPO/ooni" + +OONI_PATH_ALREADY_SET=false + +function usage() { + echo "$0 - A simple wrapper around ooniprobe and oonicli to set" + echo "up environment variables, so that it can be run without installation." + echo; + echo "Usage: $0 [oonitest || file || script] [options]" + echo "All options and parameters are passed directly to ooniprobe, do" + echo "ooniprobe.py --help to see more." + echo; +} + +function check_pythonpath_for_ooni() { + pythonpaths="$(echo $PYTHONPATH | cut -d ':' -f '1-' --output-delimiter=' ')" + for dir in $pythonpaths; do + if [[ "x$dir" == "x$OONI_REPO" ]]; then + export OONI_PATH_ALREADY_SET=true + else + continue + fi + done +} + +function add_ooni_to_pythonpath() { + if test ! $OONI_PATH_ALREADY_SET ; then + echo "Appending $OONI_REPO to PYTHONPATH..." + export PYTHONPATH=$PYTHONPATH:$OONI_REPO + fi +} + +function add_exec_dir_to_stack() { + cwd_ending=$(echo $(pwd) | awk -F/ '{print $NF}') + if [[ "x$cwd_ending" == "xooni" ]]; then + pushd $(pwd) 2&>/dev/null ## $(dirs -l -p -1) + else + pushd $OONI_DIR 2&>/dev/null + fi + export OONI_RUN_PATH="$(popd)/$OONI_EXEC" +} + +function run_ooni_in_background() { + ## :param $1: + ## The full path to the script to run, i.e. $OONI_RUN_PATH. + coproc $1 +} + +if [[ "x$#" == "x0" ]]; then + usage +else + check_pythonpath_for_ooni + add_ooni_to_pythonpath + add_exec_dir_to_stack + OONI_START_CMD="python "$OONI_DIR"/"$OONI_EXEC" $@" + #run_ooni_in_background $OONI_START_CMD + $($OONI_START_CMD) +fi

1 0

[tor/master] Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/tor
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 3a33b1fe3bd7ba4cb1fff73f97ee722a2b127db5 Merge: a45760b 63f542a Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Thu Oct 11 15:55:26 2012 -0700 Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/tor changes/src_ext | 3 + src/common/OpenBSD_malloc_Linux.c | 2057 ---------------------- src/common/ht.h | 490 ------ src/common/include.am | 3 +- src/ext/OpenBSD_malloc_Linux.c | 2057 ++++++++++++++++++++++ src/ext/eventdns.c | 3505 +++++++++++++++++++++++++++++++++++++ src/ext/eventdns.h | 337 ++++ src/ext/ht.h | 490 ++++++ src/ext/include.am | 12 + src/ext/tinytest.c | 387 ++++ src/ext/tinytest.h | 87 + src/ext/tinytest_demo.c | 215 +++ src/ext/tinytest_macros.h | 184 ++ src/include.am | 3 +- src/or/eventdns.c | 3505 ------------------------------------- src/or/eventdns.h | 337 ---- src/or/include.am | 3 +- src/test/include.am | 7 +- src/test/tinytest.c | 387 ---- src/test/tinytest.h | 87 - src/test/tinytest_demo.c | 215 --- src/test/tinytest_macros.h | 184 -- 22 files changed, 7283 insertions(+), 7272 deletions(-)

1 0