[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2016-01-18 Thread nickm 
commit 0ace22ef6dcb918c74cdfadd90a21afe622f2921
Merge: da4dbb2 83dfcfb
Author: Nick Mathewson 
Date:   Mon Jan 18 19:52:34 2016 -0500

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug18050 |7 +++
 src/or/main.c|   10 ++
 src/or/router.c  |   13 +
 3 files changed, 22 insertions(+), 8 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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit f217b24e051af2046ff03cb64fd9345967e777dd
Merge: 895a98d 4fb4906
Author: Nick Mathewson 
Date:   Wed Oct 21 12:03:04 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

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

diff --cc src/common/tortls.c
index d863567,536043e..2a2a5d7
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -2453,12 -2519,11 +2453,12 @@@ dn_indicates_v3_cert(X509_NAME *name
  
str = X509_NAME_ENTRY_get_data(entry);
len = ASN1_STRING_to_UTF8(&s, str);
 -  if (len < 0)
 +  if (len < 0) {
  return 0;
 +  }
if (len < 4) {
  OPENSSL_free(s);
- return 0;
+ return 1;
}
r = fast_memneq(s + len - 4, ".net", 4);
OPENSSL_free(s);

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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit 895a98dbaf9619c8a24ef872bfeca84a764a6ccb
Merge: 52fd384 b809c26
Author: Nick Mathewson 
Date:   Wed Oct 21 11:53:00 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17404|6 ++
 src/common/tortls.c |4 
 2 files changed, 10 insertions(+)

diff --cc src/common/tortls.c
index 1567508,b597fe2..d863567
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -2453,9 -2519,12 +2453,13 @@@ dn_indicates_v3_cert(X509_NAME *name
  
str = X509_NAME_ENTRY_get_data(entry);
len = ASN1_STRING_to_UTF8(&s, str);
 -  if (len < 0)
 +  if (len < 0) {
  return 0;
 +  }
+   if (len < 4) {
+ OPENSSL_free(s);
+ return 0;
+   }
r = fast_memneq(s + len - 4, ".net", 4);
OPENSSL_free(s);
return r;

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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit 52fd384a465ba91762bc4f71d239ed1e5150f947
Merge: f41be5f 9c4a0ae
Author: Nick Mathewson 
Date:   Wed Oct 21 11:18:11 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17403|3 +++
 src/or/routerkeys.c |2 ++
 2 files 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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit 35edd74e25cb077a89a9d6c14e542d1d1ffc7c8e
Merge: d14b009 5d45a26
Author: Nick Mathewson 
Date:   Wed Oct 21 10:56:40 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 src/or/rendcache.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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit a5e873ff29d066532322a6946c2bc4d034be8c2d
Merge: 6ef3531 03eb999
Author: Nick Mathewson 
Date:   Wed Oct 21 10:28:16 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 src/or/rendcache.c |7 +--
 1 file changed, 5 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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit d14b009b23ed2398ddc805211f322c3fa5843d04
Merge: 8b01849 aa96abe
Author: Nick Mathewson 
Date:   Wed Oct 21 10:54:12 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17402   |3 +++
 src/or/rendcache.c |   14 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --cc src/or/rendcache.c
index deb2fea,93f4440..ef7d182
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@@ -127,9 -122,15 +127,15 @@@ rend_cache_failure_intro_entry_free(ren
tor_free(entry);
  }
  
+ static void
+ rend_cache_failure_intro_entry_free_(void *entry)
+ {
+   rend_cache_failure_intro_entry_free_(entry);
+ }
+ 
  /** Allocate a rend cache failure intro object and return it. failure
   * is set into the object. This function can not fail. */
 -static rend_cache_failure_intro_t *
 +STATIC rend_cache_failure_intro_t *
  rend_cache_failure_intro_entry_new(rend_intro_point_failure_t failure)
  {
rend_cache_failure_intro_t *entry = tor_malloc(sizeof(*entry));

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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit 46cd466decfcf05cc7588256aa7e9491a7c9e918
Merge: 34b4da7 5b20701
Author: Nick Mathewson 
Date:   Wed Oct 21 10:00:52 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17401   |3 +++
 src/or/rendcache.c |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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-21 Thread nickm 
commit 2461ea1faa20fc435bdf786147afe99207366c29
Merge: d478704 542cc8a
Author: Nick Mathewson 
Date:   Wed Oct 21 08:17:34 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17398|3 +++
 src/common/crypto_ed25519.c |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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-19 Thread nickm 
commit d939a83f5bc8ccf3760f61f25afb079097b47ea2
Merge: be26c88 8378a33
Author: Nick Mathewson 
Date:   Mon Oct 19 11:20:38 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-10-15 Thread nickm 
commit a8a26ca30eae38fb47dd06392a65a8e8291ec2d0
Merge: ab3826f 7e7683b
Author: Nick Mathewson 
Date:   Thu Oct 15 13:56:53 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17354 |4 
 src/or/main.c|1 +
 2 files 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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-15 Thread nickm 
commit ab3826f8333cec974c4b020ef30acda678ebe318
Merge: fa4a815 a5ed8b1
Author: Nick Mathewson 
Date:   Thu Oct 15 10:38:09 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

2015-10-09 Thread nickm 
commit 4da2f89f9522e41212ad32d52cb7cc1b08bc1b06
Merge: 9e46158 7c3f210
Author: Nick Mathewson 
Date:   Fri Oct 9 10:18:42 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/geoip-october2015 |3 +
 src/config/geoip  | 7429 +
 src/config/geoip6 |  863 --
 3 files changed, 5447 insertions(+), 2848 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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-07 Thread nickm 
commit cd14405a431cf351abe79441214899cfee5eb670
Merge: aeb9373 c464a36
Author: Nick Mathewson 
Date:   Wed Oct 7 15:21:23 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/ifaddrs-tests-network-configs |7 +
 src/test/test_address.c   |   46 +
 2 files changed, 37 insertions(+), 16 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 remote-tracking branch 'origin/maint-0.2.7'

2015-10-06 Thread nickm 
commit bfd9dccdb8692a8d1d04c1c4004bc4bd3236c7b1
Merge: b216340 1eb838b
Author: Nick Mathewson 
Date:   Tue Oct 6 09:06:57 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17237_027|4 
 changes/bug17251|3 +++
 src/common/tortls.c |   13 +
 src/test/test_crypto_slow.c |2 +-
 4 files changed, 17 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 remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm 
commit 003462432b1ddcd938031fb7f2f7a403125b0ccb
Merge: 62d6a8e d4212d5
Author: Nick Mathewson 
Date:   Tue Sep 29 13:51:08 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 src/test/test_address.c |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 remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm 
commit aaf748435cb6e42922bf5948b04b4679bbf649b1
Merge: efff55b 22a9127
Author: Nick Mathewson 
Date:   Tue Sep 29 12:49:59 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 ChangeLog |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 remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm 
commit efff55bdfd45e1587d074430ffe5a8a775a35bf5
Merge: 8e93cfb c198195
Author: Nick Mathewson 
Date:   Tue Sep 29 10:22:38 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 ChangeLog   |2 +-
 changes/bug15609|2 ++
 src/config/torrc.minimal.in-staging |   20 ++--
 src/config/torrc.sample.in  |   20 ++--
 4 files changed, 23 insertions(+), 21 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 remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm 
commit 8e93cfb47f218dc7f431cfa820a5228b509d142c
Merge: 3d8a045 7fa102b
Author: Nick Mathewson 
Date:   Tue Sep 29 10:18:09 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17173-socket-hack-rv |   10 +
 src/common/address.c|   27 +++
 src/common/address.h|8 ++--
 src/test/test_address.c |   95 +++
 4 files changed, 127 insertions(+), 13 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 remote-tracking branch 'origin/maint-0.2.7'

2015-09-29 Thread nickm 
commit 3d8a045bd6b9395c108cfbdfd971690163ca0e21
Merge: 551dba3 216a9f7
Author: Nick Mathewson 
Date:   Tue Sep 29 10:12:05 2015 +0200

Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17151  |7 +++
 changes/bug17154  |3 +++
 configure.ac  |1 +
 src/or/include.am |4 ++--
 src/test/test_bt.sh   |1 +
 src/test/test_bt_cl.c |   11 ++-
 6 files changed, 24 insertions(+), 3 deletions(-)

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