[tor-commits] [chutney/master] Document all the test-network.sh arguments in the README

commit b86168c2e284ad8a9f090a2ea7d2a7e6d3a80f25 Author: teor (Tim Wilson-Brown) Date: Wed Jul 20 10:40:22 2016 +1000 Document all the test-network.sh arguments in the README Well, accept for --dry-run, which is an implementation detail. --- README | 15

[tor-commits] [chutney/master] Find CHUTNEY_PATH based on the script's location

commit 4f8dc02043f3a732e3ad49497a9d4965cd45ded3 Author: teor (Tim Wilson-Brown) Date: Wed Jul 20 10:39:41 2016 +1000 Find CHUTNEY_PATH based on the script's location And do this before checking TOR_DIR, which is optional. --- tools/test-network.sh | 4 1

[tor-commits] [chutney/master] Find TOR_DIR if it's called tor and next to chutney

commit 9c6885e94d22127fc982bcf7576058a64a905763 Author: teor (Tim Wilson-Brown) Date: Wed Jul 20 10:39:24 2016 +1000 Find TOR_DIR if it's called tor and next to chutney --- tools/test-network.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

commit be41f269f076095a91f92e3074dbfce41bc1413b Author: Translation commit bot Date: Tue Jul 19 20:15:11 2016 + Update translations for bridgedb_completed --- fr_CA/LC_MESSAGES/bridgedb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff

[tor-commits] [translation/bridgedb] Update translations for bridgedb

commit e9e184474b3cd27ac07d3ed1a524cff9bd6abc42 Author: Translation commit bot Date: Tue Jul 19 20:15:03 2016 + Update translations for bridgedb --- fr_CA/LC_MESSAGES/bridgedb.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

commit da2314dc34456ef6f94c6ba6fa8c5688011f8aa0 Author: Translation commit bot Date: Tue Jul 19 17:47:00 2016 + Update translations for tor_animation_completed --- sk_SK.srt | 164 ++ 1 file

[tor-commits] [translation/tor_animation] Update translations for tor_animation

commit efc2eb4599c17e49ad7c431ab4215ae91ef7aab4 Author: Translation commit bot Date: Tue Jul 19 17:46:57 2016 + Update translations for tor_animation --- sk_SK.srt | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sk_SK.srt

[tor-commits] [translation/tor_animation] Update translations for tor_animation

commit 2d96e19a30bc8d8658ed31ef7a9b17f085e3157f Author: Translation commit bot Date: Tue Jul 19 17:16:56 2016 + Update translations for tor_animation --- sk_SK.srt | 53 ++--- 1 file changed, 26 insertions(+),

[tor-commits] [translation/tor_animation] Update translations for tor_animation

commit ce9da66fcf55226fdd3d6b63f51f4144f70471be Author: Translation commit bot Date: Tue Jul 19 16:46:57 2016 + Update translations for tor_animation --- sk_SK.srt | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-)

[tor-commits] [translation/tor_animation] Update translations for tor_animation

commit 5de40526956bce74260374fbb5932a9783acb978 Author: Translation commit bot Date: Tue Jul 19 16:16:56 2016 + Update translations for tor_animation --- sk_SK.srt | 71 +++ 1 file changed, 35

[tor-commits] [metrics-web/master] Fully qualify columns in GROUP BY statement.

commit 6987c758a13a59f2c9e28af57254fd9972d6b5ee Author: Karsten Loesing Date: Tue Jul 19 17:51:37 2016 +0200 Fully qualify columns in GROUP BY statement. Turns out that explicit column aliases are not sufficient to make column references in the GROUP

[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8

commit 4d5b252f0f0179add75e4c2a2f8ab690864584f3 Merge: fbae15a 4d70ed7 Author: Nick Mathewson Date: Tue Jul 19 12:34:27 2016 +0200 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick Mathewson Date: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 4d70ed7be097593ab9ef80b52540e49d30baaf03 Merge: 7c25b41 210928f Author: Nick Mathewson Date: Tue Jul 19 12:32:14 2016 +0200 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3 Merge: 92891de d95c280 Author: Nick Mathewson Date: Tue Jul 19 12:31:54 2016 +0200 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

commit a31078a581c35310cd642b16ce57efd5b888f6dc Merge: 558f7d3 4d5b252 Author: Nick Mathewson Date: Tue Jul 19 12:34:37 2016 +0200 Merge branch 'maint-0.2.8' changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick Mathewson Date: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 4d70ed7be097593ab9ef80b52540e49d30baaf03 Merge: 7c25b41 210928f Author: Nick Mathewson Date: Tue Jul 19 12:32:14 2016 +0200 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5

commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick Mathewson Date: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

commit 4d5b252f0f0179add75e4c2a2f8ab690864584f3 Merge: fbae15a 4d70ed7 Author: Nick Mathewson Date: Tue Jul 19 12:34:27 2016 +0200 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6

commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3 Merge: 92891de d95c280 Author: Nick Mathewson Date: Tue Jul 19 12:31:54 2016 +0200 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6

commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3 Merge: 92891de d95c280 Author: Nick Mathewson Date: Tue Jul 19 12:31:54 2016 +0200 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3 Merge: 92891de d95c280 Author: Nick Mathewson Date: Tue Jul 19 12:31:54 2016 +0200 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5

commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick Mathewson Date: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

commit d95c2809b39fc45b7c30b0f29284bae7384c7224 Merge: 19078b1 79939c6 Author: Nick Mathewson Date: Tue Jul 19 12:31:20 2016 +0200 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

commit 4d70ed7be097593ab9ef80b52540e49d30baaf03 Merge: 7c25b41 210928f Author: Nick Mathewson Date: Tue Jul 19 12:32:14 2016 +0200 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-july2016 |4 + src/config/geoip | 4615

[tor-commits] [metrics-web/master] Add graph on bridges by country and transport.

commit a589b95501a926029a5e826d709e3f5e8c90ab34 Author: Karsten Loesing Date: Tue Jul 19 12:02:47 2016 +0200 Add graph on bridges by country and transport. Includes major improvements and fixes suggested by iwakeh: - Omit a mid estimate which could

[tor-commits] [metrics-web/master] Fix two typos spotted by iwakeh.

commit be233ec97068fec7c0ff448d3e1fe3643157e186 Author: Karsten Loesing Date: Tue Jul 19 11:45:18 2016 +0200 Fix two typos spotted by iwakeh. Found in old code while reviewing new code for #19544. --- modules/clients/init-userstats.sql | 4 ++-- 1 file

[tor-commits] [tor/master] Changes file for monotonic time branch.

commit 493142d91f7a553b26094308ebd2694dd30c3e0e Author: Nick Mathewson Date: Wed Jul 13 10:25:04 2016 -0400 Changes file for monotonic time branch. --- changes/monotonic | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/monotonic b/changes/monotonic

[tor-commits] [tor/master] Be sure to call monotime_init() at startup.

commit 1e3cf1cc8321ec29acaae6acb22340f0e2f5e9da Author: Nick Mathewson Date: Tue Jul 19 11:40:21 2016 +0200 Be sure to call monotime_init() at startup. --- src/or/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/master] Merge branch 'monotonic_v2_squashed'

commit 558f7d3701ef0236e0bf2886dca538cfe1ad18bd Merge: 94c27d4 1e3cf1c Author: Nick Mathewson Date: Tue Jul 19 11:42:26 2016 +0200 Merge branch 'monotonic_v2_squashed' changes/monotonic| 6 + src/common/compat.c | 91 +---

[tor-commits] [tor/master] Basic portable monotonic timer implementation

commit dc6f5d1dc1ccc86f32b39b939a5f83c35865d666 Author: Nick Mathewson Date: Fri Jul 8 12:53:51 2016 -0400 Basic portable monotonic timer implementation This code uses QueryPerformanceCounter() [**] on Windows, mach_absolute_time() on OSX, clock_gettime()

[tor-commits] [tor/master] Unit tests for monotonic time

commit abcb8ce25dbd2d76d3b84ea2aacbfc7d69d41eee Author: Nick Mathewson Date: Wed Jul 13 10:23:00 2016 -0400 Unit tests for monotonic time --- src/test/test_util.c | 125 +++ 1 file changed, 125 insertions(+) diff --git

[tor-commits] [tor/master] Make sure initialized_at is initialized before use.

commit 6ba415d4000712aecaf3d11903db5699f143569d Author: Nick Mathewson Date: Tue Jul 19 11:36:43 2016 +0200 Make sure initialized_at is initialized before use. --- src/common/compat_time.c | 8 1 file changed, 8 insertions(+) diff --git

[tor-commits] [tor/master] convert timers.c to use real monotonic time.

commit 6a2002fc091506f576934bbf50e7b8644b43bf4c Author: Nick Mathewson Date: Fri Jul 8 14:38:02 2016 -0400 convert timers.c to use real monotonic time. --- src/common/timers.c| 50 +- src/common/timers.h| 3 ++-

[tor-commits] [tor/master] Expose monotonic time ratchet functions for testing.

commit 2a217ef72392d685e6c9b48b2be3b467a8244b48 Author: Nick Mathewson Date: Wed Jul 13 10:18:15 2016 -0400 Expose monotonic time ratchet functions for testing. --- src/common/compat_time.c | 156 ++-

[tor-commits] [tor/master] Use coarse monotonic timer instead of cached monotonized libevent time.

commit c7558c906a1069308f8f4519b8c93245fbca9efd Author: Nick Mathewson Date: Fri Jul 8 15:24:21 2016 -0400 Use coarse monotonic timer instead of cached monotonized libevent time. --- src/or/buffers.c | 9 - src/or/circuitlist.c | 6 ++ src/or/relay.c

[tor-commits] [tor/master] Remove tor_gettimeofday_cached_monotonic as broken and unneeded

commit 7bc4ca7de9d434edeb21525917c81d6963a26511 Author: Nick Mathewson Date: Wed Jul 13 09:28:46 2016 -0400 Remove tor_gettimeofday_cached_monotonic as broken and unneeded --- src/common/compat_libevent.c | 30 --

[tor-commits] [tor/master] Move our "what time is it now" compat functions into a new module

commit aa971c59246332391116caafd18855bccf2f99a5 Author: Nick Mathewson Date: Fri Jul 8 10:38:59 2016 -0400 Move our "what time is it now" compat functions into a new module I'm not moving our "format and parse the time" functions, since those have been

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

commit 9c4f353d8c849ceb16861ae3771fcae004924007 Author: Translation commit bot Date: Tue Jul 19 08:15:26 2016 + Update translations for https_everywhere --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

commit 14c7fd5c60747c86a453bb55365db4d210c8b055 Author: Translation commit bot Date: Tue Jul 19 08:15:31 2016 + Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git