[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 1cd20ff848eab6ee7b441c5aab0578ab02a114bc
Merge: 05908d57f 7dd594609
Author: teor 
Date:   Mon Dec 16 08:15:55 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 145ff92d9298ff2e9913b591a91a76ea0846f361
Merge: 501b5174d 792c15fde
Author: teor 
Date:   Tue Dec 3 12:45:41 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

Merge C_DIALECT_OPTIONS from ticket32500_029 with
other configure options from maint-0.3.5.

 .travis.yml | 10 +++---
 changes/ticket32500 |  5 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --cc .travis.yml
index 7f0e78587,51368ea51..f22732187
--- a/.travis.yml
+++ b/.travis.yml
@@@ -39,12 -32,12 +39,16 @@@ matrix
  ## We run basic tests on macOS
  - compiler: clang
os: osx
+   ## Turn off some newer features, turn on clang's -Wtypedef-redefinition
+   env: C_DIALECT_OPTIONS="-std=gnu99"
 +## We check NSS
 +## NSS is a fast job, clang is slower on Linux, so we do NSS clang
 +- env: NSS_OPTIONS="--enable-nss"
 +  compiler: clang
  ## We run chutney on Linux, because it's faster than chutney on macOS
- - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+ ## Use -std=gnu99 to turn off some newer features, and maybe turn on some
+ ## extra gcc warnings?
+ - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" 
C_DIALECT_OPTIONS="-std=gnu99"
## (Linux only) Use an older Linux image (Ubuntu Trusty)
## The Xenial and Bionic images cause permissions issues for chutney,
## this is a workaround, until we fix #32240.
@@@ -195,16 -136,12 +199,16 @@@ install
- python --version
## If we're running chutney, show the chutney commit
- if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd 
; fi
 +  ## If we're running stem, show the stem version and commit
 +  - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import 
stem; print(stem.__version__);"; git log -1; popd; fi
  
  script:
 +  # Skip test_rebind on macOS
 +  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export 
TOR_SKIP_TEST_REBIND=true; fi
- ./autogen.sh
 -  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS 
$OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
 +  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS 
$MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS 
--enable-fatal-warnings --disable-silent-rules"
-   - echo "Configure flags are $CONFIGURE_FLAGS"
-   - ./configure $CONFIGURE_FLAGS
+   - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\""
+   - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS"
## We run `make check` because that's what https://jenkins.torproject.org 
does.
- if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi
- if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113
Merge: 2abff832d 853b6ad09
Author: Nick Mathewson 
Date:   Mon Nov 11 10:14:03 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-11-06 | 4 +
 src/config/geoip | 15751 +++--
 src/config/geoip6|  3078 ++---
 3 files changed, 11485 insertions(+), 7348 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26
Merge: 4abfcb799 0650bf369
Author: teor 
Date:   Wed Nov 6 11:19:30 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/bug31107 |  4 
 src/core/or/channeltls.c | 10 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --cc src/core/or/channeltls.c
index 91a424728,0..4db283d20
mode 100644,00..100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@@ -1,2477 -1,0 +1,2485 @@@
 +/* * Copyright (c) 2012-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file channeltls.c
 + *
 + * \brief A concrete subclass of channel_t using or_connection_t to transfer
 + * cells between Tor instances.
 + *
 + * This module fills in the various function pointers in channel_t, to
 + * implement the channel_tls_t channels as used in Tor today.  These channels
 + * are created from channel_tls_connect() and
 + * channel_tls_handle_incoming(). Each corresponds 1:1 to or_connection_t
 + * object, as implemented in connection_or.c.  These channels transmit cells
 + * to the underlying or_connection_t by calling
 + * connection_or_write_*_cell_to_buf(), and receive cells from the underlying
 + * or_connection_t when connection_or_process_cells_from_inbuf() calls
 + * channel_tls_handle_*_cell().
 + *
 + * Here we also implement the server (responder) side of the v3+ Tor link
 + * handshake, which uses CERTS and AUTHENTICATE cell to negotiate versions,
 + * exchange expected and observed IP and time information, and bootstrap a
 + * level of authentication higher than we have gotten on the raw TLS
 + * handshake.
 + *
 + * NOTE: Since there is currently only one type of channel, there are probably
 + * more than a few cases where functionality that is currently in
 + * channeltls.c, connection_or.c, and channel.c ought to be divided up
 + * differently.  The right time to do this is probably whenever we introduce
 + * our next channel type.
 + **/
 +
 +/*
 + * Define this so channel.h gives us things only channel_t subclasses
 + * should touch.
 + */
 +#define TOR_CHANNEL_INTERNAL_
 +
 +#define CHANNELTLS_PRIVATE
 +
 +#include "core/or/or.h"
 +#include "core/or/channel.h"
 +#include "core/or/channeltls.h"
 +#include "core/or/circuitmux.h"
 +#include "core/or/circuitmux_ewma.h"
 +#include "core/or/command.h"
 +#include "app/config/config.h"
 +#include "core/mainloop/connection.h"
 +#include "core/or/connection_or.h"
 +#include "feature/control/control.h"
 +#include "feature/client/entrynodes.h"
 +#include "trunnel/link_handshake.h"
 +#include "core/or/relay.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/relay/router.h"
 +#include "feature/relay/routermode.h"
 +#include "feature/nodelist/dirlist.h"
 +#include "core/or/scheduler.h"
 +#include "feature/nodelist/torcert.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "trunnel/channelpadding_negotiation.h"
 +#include "core/or/channelpadding.h"
 +
 +#include "core/or/cell_st.h"
 +#include "core/or/cell_queue_st.h"
 +#include "core/or/extend_info_st.h"
 +#include "core/or/or_connection_st.h"
 +#include "core/or/or_handshake_certs_st.h"
 +#include "core/or/or_handshake_state_st.h"
 +#include "feature/nodelist/routerinfo_st.h"
 +#include "core/or/var_cell_st.h"
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/x509.h"
 +
 +/** How many CELL_PADDING cells have we received, ever? */
 +uint64_t stats_n_padding_cells_processed = 0;
 +/** How many CELL_VERSIONS cells have we received, ever? */
 +uint64_t stats_n_versions_cells_processed = 0;
 +/** How many CELL_NETINFO cells have we received, ever? */
 +uint64_t stats_n_netinfo_cells_processed = 0;
 +/** How many CELL_VPADDING cells have we received, ever? */
 +uint64_t stats_n_vpadding_cells_processed = 0;
 +/** How many CELL_CERTS cells have we received, ever? */
 +uint64_t stats_n_certs_cells_processed = 0;
 +/** How many CELL_AUTH_CHALLENGE cells have we received, ever? */
 +uint64_t stats_n_auth_challenge_cells_processed = 0;
 +/** How many CELL_AUTHENTICATE cells have we received, ever? */
 +uint64_t stats_n_authenticate_cells_processed = 0;
 +/** How many CELL_AUTHORIZE cells have we received, ever? */
 +uint64_t stats_n_authorize_cells_processed = 0;
 +
 +/** Active listener, if any */
 +static channel_listener_t *channel_tls_listener = NULL;
 +
 +/* channel_tls_t method declarations */
 +
 +static void channel_tls_close_method(channel_t *chan);
 +static const char * channel_tls_describe_transport_method(channel_t *chan);
 +static void channel_tls_free_method(channel_t *chan);
 +static double channel_tls_get_overhead_estimate_method(channel_t *chan);
 +static int
 +channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out);
 +static int
 +channel_tls_get_transport_name_method(channel_t *chan, char **transport_out);
 +static const char *
 +channel_tls_get_remote_descr_method(channel_t *chan, int flags);
 +static int 

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 15d67842f9c1cb993491cf473478999dace7c6c2
Merge: e03db9934 752c35ca9
Author: teor 
Date:   Tue Oct 29 08:26:32 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

 .travis.yml | 7 ---
 changes/ticket32241 | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc .travis.yml
index 4ded5e25a,4ea9400b8..7f0e78587
--- a/.travis.yml
+++ b/.travis.yml
@@@ -145,19 -106,13 +145,20 @@@ addons
## Always installed, because manual brew installs are hard to get right
- asciidoc
- xmlto
 +  ## Utilities
 +  ## preventing or diagnosing hangs
 +  - timelimit
  
- ## (OSX only) Use the default OSX image
+ ## (OSX only) Use a recent macOS image
  ## See https://docs.travis-ci.com/user/reference/osx#os-x-version
- ## Default is Xcode 9.4 on macOS 10.13 as of August 2018
- #osx_image: xcode9.4
+ ## Default is Xcode 9.4 on macOS 10.13 as of October 2019
+ ## Recent is Xcode 11.2 on macOS 10.14 as of October 2019
+ osx_image: xcode11.2
  
 +before_install:
 +  ## Create empty rust directories for non-Rust builds, so caching succeeds
 +  - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo 
$TRAVIS_BUILD_DIR/src/rust/target; fi
 +
  install:
## If we're on OSX, configure ccache (ccache is automatically installed and 
configured on Linux)
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export 
PATH="/usr/local/opt/ccache/libexec:$PATH"; fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit e03db9934a0d26da0b119a2d15d51c4c658af1c8
Merge: 1eb57b20b 93be7275e
Author: teor 
Date:   Fri Oct 25 10:55:51 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket31919_bionic | 5 +
 1 file changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit d175e70817ccff01cd9eb73d8da9e306745fb469
Merge: c77162e4e 8682442c7
Author: teor 
Date:   Wed Oct 23 08:47:01 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867
Merge: 21c3488af 7660a7cf7
Author: teor 
Date:   Wed Oct 23 08:24:30 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 4b8e5ea0dce85bb96ce92f171246aa101feda4ac
Merge: 702aa8f77 c660f4796
Author: teor 
Date:   Thu Oct 17 14:51:50 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 7b9cb4c47bc9d1ca4e120af2b00a0f0747cd7b20
Merge: 02840169d 90de776ea
Author: Nick Mathewson 
Date:   Wed Oct 2 08:01:33 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-10-01 | 4 +
 src/config/geoip | 35299 ++---
 src/config/geoip6|  8318 ---
 3 files changed, 26359 insertions(+), 17262 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 50b45c43eb990b0b9b76a550b03eb9db229ad4f8
Merge: dc41e6a80 967460389
Author: Nick Mathewson 
Date:   Tue Sep 17 21:26:31 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93
Merge: 97f7efa9e 484710f25
Author: Nick Mathewson 
Date:   Tue Sep 17 18:57:49 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

"ours" merge to avoid picking up 0.2.9 version of ticket 31673.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 5653b93a1d25e173bebb8f45d364e3a578572789
Merge: d253b31ce 5a1c3e44f
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket31406  | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 5df0b36623005526588c35cb63b47dd256dcc5b7
Merge: 654769bce 254c1bac4
Author: teor 
Date:   Sat Aug 10 07:25:57 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5.
The 0.2.9 fix is not required for the 0.3.5 patch.
Resolves merge conflict caused by 30041.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor]

commit 1bc2ae7be7c0f418de565b4a11bbb5d510c958a9
Merge: e15b9b179 8d22c09ab
Author: teor 
Date:   Thu Aug 8 11:10:15 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.5

Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit 1dd95278970f9f32d83a31fe73e0258a30523539
Merge: b0fa1f4fb fb977f8ca
Author: Nick Mathewson 
Date:   Mon Jul 1 14:25:12 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket28795  |   5 +
 src/app/config/fallback_dirs.inc | 567 ++-
 2 files changed, 266 insertions(+), 306 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm]

commit b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2
Merge: dcb8cad4e 0ec4ebd00
Author: Nick Mathewson 
Date:   Tue Jun 11 10:17:17 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-06-10 | 4 +
 src/config/geoip | 14985 +
 src/config/geoip6|  2391 ++--
 3 files changed, 9920 insertions(+), 7460 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[nickm]

commit a521c427883697fcfa027ffd72bb38f3aee5aceb
Merge: cbce8dedd 4e262196a
Author: Nick Mathewson 
Date:   Fri May 17 08:10:15 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/geoip-2019-05-13 | 4 +
 src/config/geoip | 15407 ++---
 src/config/geoip6|  3771 +++
 3 files changed, 11335 insertions(+), 7847 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor]

commit cbce8dedd3703424111928d68dfe8920900ce054
Merge: 116970dda 2460b4461
Author: teor 
Date:   Fri Apr 19 11:59:18 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor]

commit 4d504bf098069538984690de7966a907180c7efe
Merge: 48e990359 ec213ae8a
Author: teor 
Date:   Fri Apr 19 11:39:17 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor]

commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[nickm]

commit 3cfcfbac46d15f7d1cc47da03482aa70583aa455
Merge: 74775b2df 54e249e26
Author: Nick Mathewson 
Date:   Wed Apr 3 09:27:42 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/geoip-2019-04-02 | 4 +
 src/config/geoip | 10355 +
 src/config/geoip6|  2337 ++
 3 files changed, 7344 insertions(+), 5352 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor]

commit 74775b2dfd1a30abf75f2989195ec6c1bbe95fc0
Merge: 6d057c56f f7688cb17
Author: teor 
Date:   Tue Apr 2 11:45:13 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug29703 | 4 
 1 file changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor]

commit d7a5fdcb7408536008e8142becc323148e901da5
Merge: aec6ee201 db2ac3b9f
Author: teor 
Date:   Wed Mar 20 09:47:55 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

[teor]

commit e021f89f3636d197058dddea4383632bdf466ff0
Merge: f3b17a6b2 8bd9b2a6a
Author: teor 
Date:   Thu Mar 14 06:56:38 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug25733 | 4 
 1 file changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[teor]

commit 76b55fde815f3f61161ba21adf90154fc2e53907
Merge: be71cce9f 7786198ee
Author: teor 
Date:   Fri Mar 1 14:15:59 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[teor]

commit 3313444ef08b891d344b1965a7776260c02f27ab
Merge: 6c966b894 4d9eb4dd0
Author: teor 
Date:   Thu Feb 28 10:45:30 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29599  | 3 +++
 src/test/test_shared_random.c | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[teor]

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf
Merge: fb309f6eb 4417ac880
Author: teor 
Date:   Wed Feb 27 09:37:36 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29145| 3 +++
 src/test/test-memwipe.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/test/test-memwipe.c
index 89d946d50,c650b99c8..4beb61369
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@@ -39,10 -36,11 +39,11 @@@ const char *s = NULL
  sum += (unsigned char)buf[i];   \
}
  
 -#ifdef __OpenBSD__
 +#ifdef OpenBSD
  /* Disable some of OpenBSD's malloc protections for this test. This helps
   * us do bad things, such as access freed buffers, without crashing. */
- const char *malloc_options="sufjj";
+ extern const char *malloc_options;
+ const char *malloc_options = "sufjj";
  #endif
  
  static unsigned



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 7ead2af622b968e3dc843de0d49a8b3898e53506
Merge: 4d7a0a131 a3f9ddcf0
Author: Nick Mathewson 
Date:   Tue Feb 12 09:56:49 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-02-05 | 4 +
 src/config/geoip | 22020 -
 src/config/geoip6|  2401 +++--
 3 files changed, 16972 insertions(+), 7453 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit ba71b178655fcec2ad55383987001d2fd6a3873d
Merge: fee2eaf2d 445d6750f
Author: Nick Mathewson 
Date:   Mon Jan 7 08:43:45 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-01-03 | 4 +
 src/config/geoip | 12599 ++---
 src/config/geoip6|  1764 ---
 3 files changed, 7458 insertions(+), 6909 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit fee2eaf2d4b401c0e6d879224bf42992a780085a
Merge: bf8bb9c52 73de7b4bc
Author: Nick Mathewson 
Date:   Fri Jan 4 15:04:58 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 93019b4787e71a56d3d3f3bc89f65919930f1dda
Merge: c1f919158 3b5188576
Author: Nick Mathewson 
Date:   Tue Dec 11 10:00:22 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/ticket24803 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit c1f9191581eae2d04a4ffacf7a7066a16c9f5eae
Merge: 00341d97f 4991b2931
Author: Nick Mathewson 
Date:   Tue Dec 11 09:41:04 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/ticket24803  |   5 +
 src/or/fallback_dirs.inc | 581 ++-
 2 files changed, 333 insertions(+), 253 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 00341d97f356142619865218b2ff6a6ae95dca5d
Merge: ffc7b81b5 57798eb1c
Author: Nick Mathewson 
Date:   Thu Dec 6 09:26:32 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-12-05 | 4 +
 src/config/geoip | 10100 +++--
 src/config/geoip6|  3151 +-
 3 files changed, 8147 insertions(+), 5108 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit cbe04d455016233f4759fe281c07dd7db6096c2a
Merge: aebe8a82c 8569166c7
Author: Nick Mathewson 
Date:   Thu Nov 15 16:54:16 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug24104|   4 ++
 src/or/rephist.c|   7 ++-
 src/or/rephist.h|   5 +-
 src/or/router.c |  25 +++--
 src/test/log_test_helpers.c |  23 +++-
 src/test/log_test_helpers.h |   8 ++-
 src/test/test_router.c  | 124 +++-
 7 files changed, 179 insertions(+), 17 deletions(-)

diff --cc src/or/rephist.c
index 43494692c,2844c4d74..67e4d3150
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@@ -3205,4 -3292,4 +3205,3 @@@ rep_hist_free_all(void
tor_assert_nonfatal(rephist_total_alloc == 0);
tor_assert_nonfatal_once(rephist_total_num == 0);
  }
--
diff --cc src/or/rephist.h
index 507272159,6d35ac67f..3e64a3de4
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@@ -111,30 -119,5 +111,29 @@@ extern int onion_handshakes_requested[M
  extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1];
  #endif
  
 -#endif
 -
 +/**
 + * Represents the type of a cell for padding accounting
 + */
 +typedef enum padding_type_t {
 +/** A RELAY_DROP cell */
 +PADDING_TYPE_DROP,
 +/** A CELL_PADDING cell */
 +PADDING_TYPE_CELL,
 +/** Total counts of padding and non-padding together */
 +PADDING_TYPE_TOTAL,
 +/** Total cell counts for all padding-enabled channels */
 +PADDING_TYPE_ENABLED_TOTAL,
 +/** CELL_PADDING counts for all padding-enabled channels */
 +PADDING_TYPE_ENABLED_CELL
 +} padding_type_t;
 +
 +/** The amount of time over which the padding cell counts were counted */
 +#define REPHIST_CELL_PADDING_COUNTS_INTERVAL (24*60*60)
 +void rep_hist_padding_count_read(padding_type_t type);
 +void rep_hist_padding_count_write(padding_type_t type);
 +char *rep_hist_get_padding_count_lines(void);
 +void rep_hist_reset_padding_counts(void);
 +void rep_hist_prep_published_padding_counts(time_t now);
 +void rep_hist_padding_count_timers(uint64_t num_timers);
 +
 +#endif /* !defined(TOR_REPHIST_H) */
- 
diff --cc src/test/log_test_helpers.c
index d5a39cfee,c5368b6cb..1ad01afc8
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@@ -238,4 -258,4 +258,3 @@@ mock_dump_saved_logs(void
 escaped(m->generated_msg));
} SMARTLIST_FOREACH_END(m);
  }
--
diff --cc src/test/log_test_helpers.h
index 70c584eb3,a087b913f..f74028a8a
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@@ -101,5 -106,5 +106,4 @@@ void mock_dump_saved_logs(void)
assert_log_predicate(!mock_saved_log_has_entry(), \
  "expected log to not contain entries");
  
 -#endif
 -
 +#endif /* !defined(TOR_LOG_TEST_HELPERS_H) */
- 
diff --cc src/test/test_router.c
index 4e96e2453,51055a336..84473822a
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@@ -8,105 -7,136 +8,227 @@@
   **/
  
  #include "or.h"
 +#include "config.h"
 +#include "crypto_curve25519.h"
 +#include "crypto_ed25519.h"
+ #include "hibernate.h"
 -#include "log_test_helpers.h"
+ #include "main.h"
+ #include "rephist.h"
  #include "router.h"
 +#include "routerlist.h"
 +
 +/* Test suite stuff */
  #include "test.h"
++#include "log_test_helpers.h"
 +
 +NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void));
 +
 +static routerinfo_t* mock_routerinfo;
 +
 +static const routerinfo_t*
 +NS(router_get_my_routerinfo)(void)
 +{
 +  crypto_pk_t* ident_key;
 +  crypto_pk_t* tap_key;
 +  time_t now;
 +
 +  if (!mock_routerinfo) {
 +/* Mock the published timestamp, otherwise router_dump_router_to_string()
 + * will poop its pants. */
 +time();
 +
 +/* We'll need keys, or router_dump_router_to_string() would return NULL. 
*/
 +ident_key = pk_generate(0);
 +tap_key = pk_generate(0);
 +
 +tor_assert(ident_key != NULL);
 +tor_assert(tap_key != NULL);
 +
 +mock_routerinfo = tor_malloc_zero(sizeof(routerinfo_t));
 +mock_routerinfo->nickname = tor_strdup("ConlonNancarrow");
 +mock_routerinfo->addr = 123456789;
 +mock_routerinfo->or_port = 443;
 +mock_routerinfo->platform = tor_strdup("unittest");
 +mock_routerinfo->cache_info.published_on = now;
 +mock_routerinfo->identity_pkey = crypto_pk_dup_key(ident_key);
 +mock_routerinfo->onion_pkey = crypto_pk_dup_key(tap_key);
 +mock_routerinfo->bandwidthrate = 9001;
 +mock_routerinfo->bandwidthburst = 9002;
 +  }
 +
 +  return mock_routerinfo;
 +}
 +
 +/* If no distribution option was set, then check_bridge_distribution_setting()
 + * should have set it to "any". */
 +static void
 +test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
 +{
 +  const char* needle = "bridge-distribution-request any";
 +  or_options_t* options = get_options_mutable();
 +  routerinfo_t* router = NULL;
 +  curve25519_keypair_t ntor_keypair;
 +  ed25519_keypair_t signing_keypair;
 +  char* desc = NULL;
 +  

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 54d1a2d80537e9f9a90dcca18c9e616f73809f58
Merge: 93b6d4137 7f042cbc0
Author: Nick Mathewson 
Date:   Tue Nov 13 08:27:17 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug28413 | 4 
 src/common/aes.c | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc src/common/aes.c
index 5d0841dfa,8ab2d2fc6..4d4a2d773
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@@ -402,5 -401,4 +402,4 @@@ aes_set_iv(aes_cnt_cipher_t *cipher, co
memcpy(cipher->ctr_buf.buf, iv, 16);
  }
  
 -#endif
 +#endif /* defined(USE_EVP_AES_CTR) */
- 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit c06b7f090cfe49cef1b174d69277534eb0441696
Merge: 6bd069630 45e0004b6
Author: Nick Mathewson 
Date:   Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug28245|  6 ++
 configure.ac|  1 +
 src/common/tortls.c | 17 +
 3 files changed, 24 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit bcc1a7180870368b69d51706226c2f667c482506
Merge: 038bc21f8 0a824bd88
Author: Nick Mathewson 
Date:   Wed Oct 31 11:01:40 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug27948|  6 ++
 src/test/bt_test.py | 10 ++
 2 files changed, 12 insertions(+), 4 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit 86e0be421f14f386327f95df2cea0b3c59323463
Merge: 796e36e53 5b28190c6
Author: Nick Mathewson 
Date:   Mon Oct 15 12:47:46 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.3

 src/common/util_bug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit dff7d3d00ad5e3f9e59cd4b11f302601790d1061
Merge: f7e93cf2e b11339965
Author: Nick Mathewson 
Date:   Mon Oct 15 10:37:49 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug27709  |  4 
 src/common/util_bug.h | 57 +++
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --cc src/common/util_bug.h
index be549fde0,f3e5b7c96..c274355f3
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@@ -53,8 -27,37 +53,37 @@@
   * security-critical properties.
   */
  #error "Sorry; we don't support building with NDEBUG."
 -#endif
 +#endif /* defined(NDEBUG) */
  
+ #if defined(TOR_UNIT_TESTS) && defined(__GNUC__)
+ /* We define this GCC macro as a replacement for PREDICT_UNLIKELY() in this
+  * header, so that in our unit test builds, we'll get compiler warnings about
+  * stuff like tor_assert(n = 5).
+  *
+  * The key here is that (e) is wrapped in exactly one layer of parentheses,
+  * and then passed right to a conditional.  If you do anything else to the
+  * expression here, or introduce any more parentheses, the compiler won't
+  * help you.
+  *
+  * We only do this for the unit-test build case because it interferes with
+  * the likely-branch labeling.  Note below that in the other case, we define
+  * these macros to just be synonyms for PREDICT_(UN)LIKELY.
+  */
+ #define ASSERT_PREDICT_UNLIKELY_(e) \
+   ({\
+ int tor__assert_tmp_value__;\
+ if (e)  \
+   tor__assert_tmp_value__ = 1;  \
+ else\
+   tor__assert_tmp_value__ = 0;  \
+ tor__assert_tmp_value__;\
+   })
+ #define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e)
+ #else
+ #define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e)
+ #define ASSERT_PREDICT_LIKELY_(e) PREDICT_LIKELY(e)
+ #endif
+ 
  /* Sometimes we don't want to use assertions during branch coverage tests; it
   * leads to tons of unreached branches which in reality are only assertions we
   * didn't hit. */
@@@ -140,10 -143,10 +172,10 @@@ extern int bug_macro_deadcode_dummy__
} \
STMT_END
  #define BUG(cond)   \
-   (PREDICT_UNLIKELY(cond) ? \
+   (ASSERT_PREDICT_UNLIKELY_(cond) ? \
 (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0), 1) \
 : 0)
 -#endif
 +#endif /* defined(ALL_BUGS_ARE_FATAL) || ... */
  
  #ifdef __GNUC__
  #define IF_BUG_ONCE__(cond,var) \
@@@ -155,11 -158,11 +187,11 @@@
  tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \
"!("#cond")", 1); \
} \
-   PREDICT_UNLIKELY(bool_result); } ))
+   bool_result; } ))
 -#else
 +#else /* !(defined(__GNUC__)) */
  #define IF_BUG_ONCE__(cond,var) \
static int var = 0;   \
-   if (PREDICT_UNLIKELY(cond) ?  \
+   if ((cond) ?  \
(var ? 1 :\
 (var=1,  \
  tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \
@@@ -196,7 -199,6 +228,6 @@@ void tor_capture_bugs_(int n)
  void tor_end_capture_bugs_(void);
  const struct smartlist_t *tor_get_captured_bug_log_(void);
  void tor_set_failed_assertion_callback(void (*fn)(void));
 -#endif
 +#endif /* defined(TOR_UNIT_TESTS) */
  
 -#endif
 +#endif /* !defined(TOR_UTIL_BUG_H) */
- 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit f7e93cf2e7c80fa6dc6c907893b7b01c31b588d1
Merge: cc10873de 717507e3b
Author: Nick Mathewson 
Date:   Wed Oct 10 17:12:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.3




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm]

commit b057623bedad74b147d71f00c47dca7bd5fac14a
Merge: 2cadd93ce 119df9c1c
Author: Nick Mathewson 
Date:   Wed Oct 10 11:34:48 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-10-09 | 4 +
 src/config/geoip | 38518 ++---
 src/config/geoip6|  1317 +-
 3 files changed, 30779 insertions(+), 9060 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 5b04392c1553e2a3e278a48f8d0e071181c0444f
Merge: 0971b3ce4 e24195c7c
Author: Nick Mathewson 
Date:   Fri Sep 21 09:35:23 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27316 |  3 +++
 src/or/protover.c| 15 +++
 src/test/test_protover.c |  4 
 3 files changed, 22 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 12258bbb9056ae400a58de4eb57c3de079b21782
Merge: 2968c716d b205714ba
Author: David Goulet 
Date:   Tue Jul 3 13:31:06 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26535.029 | 5 +
 src/test/ntor_ref.py | 9 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson 
Date:   Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 3119cb5062e2cc7aee46c853a9c7373e6efdaaea
Merge: 8408331b3 19429fac2
Author: Nick Mathewson 
Date:   Tue Sep 11 12:04:55 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/geoip-2018-09-06 | 4 +
 src/config/geoip | 49324 +
 src/config/geoip6|  8574 
 3 files changed, 18629 insertions(+), 39273 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 8408331b3e965dfad3c79fadc51f0b01eed366fe
Merge: ec4a7641f b203dedaf
Author: Nick Mathewson 
Date:   Mon Sep 10 09:41:39 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0
Merge: cdaf9aec8 da29074fc
Author: Nick Mathewson 
Date:   Fri Sep 7 15:11:49 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9
Merge: 987e12a58 1e46a391b
Author: Nick Mathewson 
Date:   Fri Sep 7 09:15:52 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27344| 4 
 configure.ac| 1 +
 src/common/tortls.c | 7 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --cc src/common/tortls.c
index 03c0be1cd,1f2fe1ce1..6efc8c3e4
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -1171,7 -1129,12 +1171,13 @@@ tor_tls_context_new(crypto_pk_t *identi
  #else
if (!(result->ctx = SSL_CTX_new(SSLv23_method(
  goto error;
 -#endif
 +#endif /* defined(HAVE_TLS_METHOD) */
++
+ #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
+   /* Level 1 re-enables RSA1024 and DH1024 for compatibility with old tors */
+   SSL_CTX_set_security_level(result->ctx, 1);
+ #endif
+ 
SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2);
SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3);
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 987e12a58f6ce9e0001413e665ac2aa92869af77
Merge: eacaff6cc 9fcb3ef78
Author: Nick Mathewson 
Date:   Fri Sep 7 08:46:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit a5ed62f96cafa1be251f9a7b4aafa519de4c2645
Merge: a08e6e711 912ae2b8d
Author: Nick Mathewson 
Date:   Fri Sep 7 08:44:39 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27463| 3 +++
 src/or/rendclient.c | 9 +
 2 files changed, 12 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit a08e6e711fbcd6a12818f1fe14739fc0e870434d
Merge: 57b207efa 1570f17f9
Author: Nick Mathewson 
Date:   Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27465 | 5 +
 src/common/address.c | 5 -
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 57b207efa42e0a2794457cc7aff9c662d9000b44
Merge: 2b1b8bf2c ff1486385
Author: Nick Mathewson 
Date:   Wed Sep 5 10:15:42 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 .travis.yml  | 2 +-
 changes/bug27418 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index a64b5e61f,a323b4ecd..82eced41b
--- a/.travis.yml
+++ b/.travis.yml
@@@ -169,8 -133,8 +169,8 @@@ install
  
  script:
- ./autogen.sh
 -  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS 
$OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
 +  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS 
$OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
-   - echo $CONFIGURE_FLAGS
+   - echo "Configure flags are $CONFIGURE_FLAGS"
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org 
does.
- if [[ "$DISTCHECK" == "" ]]; then make check; fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 2b1b8bf2cad4af304d38f88e38047da7e0be
Merge: b40f9967f 4e4b6a247
Author: Nick Mathewson 
Date:   Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 .travis.yml  | 6 +++---
 changes/bug27453 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 383bc,6330eb9b9..a935ac36a
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include 
  #else
  #include 
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include 
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit c1ad40627bbccf2682f56053c77ff719c822cbce
Merge: a5bbe3f1d 9068e2fa2
Author: Nick Mathewson 
Date:   Wed Aug 22 09:37:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 src/or/connection_edge.c | 1 -
 src/test/test_tortls.c   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946
Merge: a29e9a901 05d62a3b7
Author: Nick Mathewson 
Date:   Tue Aug 21 20:03:46 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit d52f406001082474c3decf04747bf6f742b82c96
Merge: c798957b5 85a879234
Author: Nick Mathewson 
Date:   Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27226   |   5 +++
 src/common/tortls.c|  10 +++--
 src/test/test_tortls.c | 119 +
 3 files changed, 71 insertions(+), 63 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit a26a2735b9cf9c6940d784f755f983088c333833
Merge: 8982719f6 4c355ff18
Author: Nick Mathewson 
Date:   Wed Aug 15 12:20:57 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug27081 | 4 
 configure.ac | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 8982719f6ac06383c26283b60acf6b3d3fde613e
Merge: 8e68fe7e1 fe19b40fe
Author: Nick Mathewson 
Date:   Thu Aug 9 08:47:24 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/geoip-2018-08-07 | 4 +
 src/config/geoip | 14291 ++---
 src/config/geoip6|   974 ++-
 3 files changed, 9063 insertions(+), 6206 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb
Merge: 4856a6e6c 27a2a6cb9
Author: Nick Mathewson 
Date:   Wed Aug 8 09:26:22 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug25440 | 5 +
 src/common/sandbox.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 312a42fc854a732d5f0fe4d5dcc1f567c2e069f4
Merge: 78386d8cd 93da2cae4
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:25 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26787 | 3 +++
 1 file changed, 3 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 78386d8cdd67ca9c00e77d5d8e6604c0841a7098
Merge: 559f79fd7 501deba8c
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:10 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 src/test/test_bt.sh | 2 ++
 1 file changed, 2 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 559f79fd79b7c22caac2888f82e92307be02904a
Merge: 61a2762e3 a321d7240
Author: Nick Mathewson 
Date:   Wed Jul 18 15:03:27 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26485|  4 
 src/or/config.c |  9 -
 src/or/dirserv.c| 43 +--
 src/or/dirserv.h|  3 +--
 src/or/dirvote.c|  9 -
 src/test/test_dir.c | 53 -
 6 files changed, 110 insertions(+), 11 deletions(-)

diff --cc src/or/dirserv.h
index 46967a6cb,624cd7e0b..5f195442c
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@@ -190,19 -140,4 +190,18 @@@ int dirserv_read_measured_bandwidths(co
  int dirserv_read_guardfraction_file(const char *fname,
   smartlist_t *vote_routerstatuses);
  
 -#endif
 +spooled_resource_t *spooled_resource_new(dir_spool_source_t source,
 + const uint8_t *digest,
 + size_t digestlen);
 +spooled_resource_t *spooled_resource_new_from_cache_entry(
 +  struct consensus_cache_entry_t *entry);
 +void spooled_resource_free(spooled_resource_t *spooled);
 +void dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
 + time_t cutoff,
 + int compression,
 + size_t *size_out,
 + int *n_expired_out);
 +void dirserv_spool_sort(dir_connection_t *conn);
 +void dir_conn_clear_spool(dir_connection_t *conn);
 +
 +#endif /* !defined(TOR_DIRSERV_H) */
- 
diff --cc src/test/test_dir.c
index b21ce5048,4cdbfb4f8..28489d939
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@@ -6110,89 -5457,56 +6110,140 @@@ test_dir_assumed_flags(void *arg
  }
  
  static void
 +test_dir_post_parsing(void *arg)
 +{
 +  (void) arg;
 +
 +  /* Test the version parsing from an HS descriptor publish request. */
 +  {
 +const char *end;
 +const char *prefix = "/tor/hs/";
 +int version = parse_hs_version_from_post("/tor/hs//publish", prefix, 
);
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +version = parse_hs_version_from_post("/tor/hs/a/publish", prefix, );
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +version = parse_hs_version_from_post("/tor/hs/3/publish", prefix, );
 +tt_int_op(version, OP_EQ, 3);
 +tt_str_op(end, OP_EQ, "/publish");
 +version = parse_hs_version_from_post("/tor/hs/42/publish", prefix, );
 +tt_int_op(version, OP_EQ, 42);
 +tt_str_op(end, OP_EQ, "/publish");
 +version = parse_hs_version_from_post("/tor/hs/18163/publish",prefix, 
);
 +tt_int_op(version, OP_EQ, 18163);
 +tt_str_op(end, OP_EQ, "/publish");
 +version = parse_hs_version_from_post("JUNKJUNKJUNK", prefix, );
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +version = parse_hs_version_from_post("/tor/hs/3/publish", "blah", );
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +/* Missing the '/' at the end of the prefix. */
 +version = parse_hs_version_from_post("/tor/hs/3/publish", "/tor/hs", 
);
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +version = parse_hs_version_from_post("/random/blah/tor/hs/3/publish",
 + prefix, );
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +version = parse_hs_version_from_post("/tor/hs/3/publish/random/junk",
 + prefix, );
 +tt_int_op(version, OP_EQ, 3);
 +tt_str_op(end, OP_EQ, "/publish/random/junk");
 +version = parse_hs_version_from_post("/tor/hs/-1/publish", prefix, );
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +/* INT_MAX */
 +version = parse_hs_version_from_post("/tor/hs/2147483647/publish",
 + prefix, );
 +tt_int_op(version, OP_EQ, INT_MAX);
 +tt_str_op(end, OP_EQ, "/publish");
 +/* INT_MAX + 1*/
 +version = parse_hs_version_from_post("/tor/hs/2147483648/publish",
 + prefix, );
 +tt_int_op(version, OP_EQ, -1);
 +tt_ptr_op(end, OP_EQ, NULL);
 +  }
 +
 + done:
 +  ;
 +}
 +
 +static void
 +test_dir_platform_str(void *arg)
 +{
 +  char platform[256];
 +  (void)arg;
 +  platform[0] = 0;
 +  get_platform_str(platform, sizeof(platform));
 +  tt_int_op((int)strlen(platform), OP_GT, 0);
 +  tt_assert(!strcmpstart(platform, "Tor "));
 +
 +  tor_version_t ver;
 +  // make sure this is a tor version, a real actual tor version.
 +  tt_int_op(tor_version_parse_platform(platform, , 1), OP_EQ, 1);
 +
 +  TT_BLATHER(("%d.%d.%d.%d", ver.major, ver.minor, ver.micro, 
ver.patchlevel));
 +
 +  // Handle an example 

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 61a2762e353f29b8b4402bf068e6268809174702
Merge: 98ee23ca1 6dafddd05
Author: Nick Mathewson 
Date:   Tue Jul 17 14:56:52 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26830| 3 +++
 src/test/test_keygen.sh | 8 
 2 files changed, 11 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 98ee23ca1e09cb6ac9e4b8e4bca67557ebb69906
Merge: 6ad2c2b92 cd4795ca3
Author: Nick Mathewson 
Date:   Thu Jul 12 14:32:16 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/task26771| 4 
 src/or/auth_dirs.inc | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit 4a604d99382e4aad3df257e265c852f306f7bc7f
Merge: d3894dc34 8b53dfc36
Author: Nick Mathewson 
Date:   Mon Jul 9 10:14:43 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26269 |  5 +
 src/or/router.c  | 15 +--
 2 files changed, 14 insertions(+), 6 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit d3894dc34b66fc5090b674ff850071aaf319d1c8
Merge: a4e8f9450 9faa28b60
Author: Nick Mathewson 
Date:   Mon Jul 9 09:11:41 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/geoip-2018-07-03 |4 +
 src/config/geoip | 7171 --
 src/config/geoip6|  752 +++--
 3 files changed, 3732 insertions(+), 4195 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm]

commit a4e8f945077b8eebbbd5be85f89b1631305ce1cc
Merge: e6366f787 b205714ba
Author: Nick Mathewson 
Date:   Tue Jul 3 09:48:03 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26535.029 | 5 +
 src/test/ntor_ref.py | 9 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce
Merge: a3ec89a4f 1953a7e61
Author: Nick Mathewson 
Date:   Fri Jun 29 23:11:47 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 scripts/maint/checkSpace.pl | 5 -
 1 file changed, 5 deletions(-)

diff --cc scripts/maint/checkSpace.pl
index 6d19d6ccd,5af95a27e..3043eb1aa
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV) 
  }
  }
  
 -  ## Check for forbidden functions except when they are
 -  # explicitly permitted
 -  if (/\bassert\(/ && not /assert OK/) {
 -  print "assert :$fn:$.   (use tor_assert)\n";
 -  }
 -  if (/\bmemcmp\(/ && not /memcmp OK/) {
 -  print "memcmp :$fn:$.   (use {tor,fast}_mem{eq,neq,cmp}\n";
 -  }
 -  # always forbidden.
 -  if (not / OVERRIDE /) {
 -  if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
 -  print "$& :$fn:$.\n";
 -  }
 -  if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
 -  /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
 -  print "$& :$fn:$.(use tor_malloc, tor_free, etc)\n";
 -  }
 -  }
 +## Check for forbidden functions except when they are
 +# explicitly permitted
 +if (/\bassert\(/ && not /assert OK/) {
 +msg "assert :$fn:$.   (use tor_assert)\n";
 +}
 +if (/\bmemcmp\(/ && not /memcmp OK/) {
 +msg "memcmp :$fn:$.   (use {tor,fast}_mem{eq,neq,cmp}\n";
 +}
 +# always forbidden.
 +if (not /\ OVERRIDE\ /) {
 +if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
 +msg "$& :$fn:$.\n";
 +}
 +if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
 +/\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
 +msg "$& :$fn:$.(use tor_malloc, tor_free, etc)\n";
 +}
 +}
  }
  }
- ## Warn if the file doesn't end with a blank line.
- #(End each file with a single blank line.)
- if (! $lastnil) {
- msg "  EOL\@EOF:$fn:$.\n";
- }
  close(F);
  }
 +
 +exit $found;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit a3ec89a4f8a6222403697b7f7fce5d5138b79994
Merge: d583459d5 3c0a63c40
Author: Nick Mathewson 
Date:   Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/test/test_shared_random.c | 1 +
 1 file changed, 1 insertion(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit ea14d3408df7c846722b54484cf5b8d61de5384f
Merge: b89a66e99 890bc15ab
Author: Nick Mathewson 
Date:   Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26467 | 3 +++
 1 file changed, 3 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 1385a5118d55edd3dd672eeb793b662853f30758
Merge: d6d3f8486 b426e83f0
Author: Nick Mathewson 
Date:   Fri Jun 29 13:00:56 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/or/routerlist.c   | 2 ++
 src/or/shared_random_state.c  | 1 +
 src/test/test_hs.c| 7 +--
 src/test/test_shared_random.c | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit d6d3f8486dbac9837a793f431dcd58505e7274e4
Merge: 340fcc7e2 fcd26af7c
Author: Nick Mathewson 
Date:   Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/feature26372_029 | 4 
 configure.ac | 6 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6
Merge: 9713ecfc4 dd69e74e3
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .editorconfig | 33 +
 1 file changed, 33 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 19f386852333a6de5fbf9bcb3a4415b3bb135b4d
Merge: 1ef8023e0 ae540569c
Author: Nick Mathewson 
Date:   Tue Jun 12 08:11:19 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-06-07 |4 +
 src/config/geoip | 5848 +-
 src/config/geoip6|  810 ++-
 3 files changed, 4354 insertions(+), 2308 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 1ef8023e000d9136b7069515f9d7303810a8f3b2
Merge: f48fb8a72 719b5c1d2
Author: Nick Mathewson 
Date:   Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26196  |  4 
 src/or/protover.c | 13 +
 2 files changed, 17 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit f48fb8a720c7cca79249248f92e3bc99cee3414d
Merge: d3a972561 c380562ae
Author: Nick Mathewson 
Date:   Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26116   |  7 +++
 src/common/crypto.c|  7 ++-
 src/test/test_crypto.c | 41 +
 3 files changed, 54 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit d3a972561aeb38d7b346be1826054c60bf3adfaa
Merge: 502d2c006 d1e4ffc71
Author: Nick Mathewson 
Date:   Wed May 16 12:11:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26072 | 5 +
 src/or/relay.c   | 1 +
 2 files changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 502d2c00625501f312496d842aeb16a840d4d7b0
Merge: 2d61a8351 033e4723f
Author: Nick Mathewson 
Date:   Tue May 15 09:32:44 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-05-01 |4 +
 src/config/geoip | 5455 ++
 src/config/geoip6|  971 +++--
 3 files changed, 4468 insertions(+), 1962 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit ba70439210c57b0e0e60b07f116f101725085d85
Merge: aa08c1970 edb6acf9c
Author: Nick Mathewson 
Date:   Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/test/test_dir.c | 20 
 1 file changed, 20 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3
Merge: 6361a250f bca8a104b
Author: Nick Mathewson 
Date:   Thu May 10 08:00:35 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26062| 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 6361a250f08421aa1e6db1093aaa488ee24ce77d
Merge: 726f238b7 5227754b2
Author: Nick Mathewson 
Date:   Thu May 3 13:38:54 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 993e314c6f08d587480070e9f19d313b81b39a09
Merge: bb35405d2 d465bd27e
Author: Nick Mathewson 
Date:   Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26007 |  5 +
 src/or/dirserv.c | 13 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5cc3a0379eba0eb4e9baac97468fcaebcc654437
Merge: e88863407 34e7dca9c
Author: Nick Mathewson 
Date:   Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml  | 5 -
 changes/travis_distcheck | 4 
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index bf55b7756,6da3027b8..3f133782d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,9 -89,9 +96,11 @@@ matrix
include:
  - compiler: gcc
  - compiler: gcc
 +  env: RUST_OPTIONS=""
 +- compiler: gcc
env: COVERAGE_OPTIONS="--enable-coverage"
+ - compiler: gcc
+   env: DISTCHECK="yes"
  ## The "sudo: required" forces non-containerized builds, working
  ## around a Travis CI environment issue: clang LeakAnalyzer fails
  ## because it requires ptrace and the containerized environment no



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e
Merge: ce8e7427b 9727b4c5d
Author: Nick Mathewson 
Date:   Mon Apr 23 09:23:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24969 | 3 +++
 src/common/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d
Merge: 5e0fbd700 d3ff12630
Author: Nick Mathewson 
Date:   Tue Apr 17 10:47:30 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml   | 9 -
 changes/coveralls | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index 0c0188410,dc0a8ac67..bf55b7756
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,7 -89,7 +96,9 @@@ matrix
include:
  - compiler: gcc
  - compiler: gcc
 +  env: RUST_OPTIONS=""
++- compiler: gcc
+   env: COVERAGE_OPTIONS="--enable-coverage"
  ## The "sudo: required" forces non-containerized builds, working
  ## around a Travis CI environment issue: clang LeakAnalyzer fails
  ## because it requires ptrace and the containerized environment no
@@@ -111,7 -101,8 +113,8 @@@ before_install
## If we're on OSX, homebrew usually needs to updated first
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
## Download rustup
 -  - curl -Ssf -o rustup.sh https://sh.rustup.rs
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh 
https://sh.rustup.rs; fi
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user 
cpp-coveralls; fi
  
  install:
## If we're on OSX use brew to install required dependencies (for Linux, 
see the "apt:" section above)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 5e0fbd7006993a4e402f2eee49f6f86074923197
Merge: db6902c23 0e13ff481
Author: Nick Mathewson 
Date:   Mon Apr 16 13:48:23 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 src/common/address.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit db6902c23530f8d58e999701685e9cbd74b15a82
Merge: e813116d3 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:29 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --cc src/or/include.am
index 5d5ff5c41,19cf00264..7548ed094
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -144,10 -127,9 +144,11 @@@ endi
  
  ORHEADERS = \
src/or/addressmap.h \
+   src/or/auth_dirs.inc\
 +  src/or/bridges.h\
src/or/buffers.h\
src/or/channel.h\
 +  src/or/channelpadding.h \
src/or/channeltls.h \
src/or/circpathbias.h   \
src/or/circuitbuild.h   \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits