commit 3569cffe1441e2e8c754feffcdc229e9a2680d0d
Merge: 809217e 62b02a1
Author: Nick Mathewson
Date: Fri Oct 9 10:12:59 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-october2015 |3 +
src/config/geoip | 7429 +++
commit 809217e6f3665e20718a406871585fa932dd4578
Merge: 01bb260 8b3e0b7
Author: Nick Mathewson
Date: Thu Sep 24 10:06:00 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-september2015 |3 +
src/config/geoip| 3977 ++
commit 01bb260f3108688f2ca54b1eea813980dd94ea1f
Merge: fd082c3 7004d67
Author: Nick Mathewson
Date: Wed Jul 29 10:47:07 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-july2015 |3 +
src/config/geoip | 2975
commit fd082c394bf392cab0c586313a82d5bb3bbd6139
Merge: 75388f6 fde4199
Author: Nick Mathewson
Date: Thu Jun 25 11:43:04 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-june2015 |3 +
changes/geoip6-june2015 |3 +
src/config/geoip
commit 6c7720ed49623f649aa6280606c129ee153b04ed
Merge: 3a5d4d6 efae1bc
Author: Nick Mathewson
Date: Mon Apr 27 14:16:55 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-april2015 |3 +
changes/geoip6-april2015 |2 +
src/config/geoip
commit 5633261f2e902e5b6c5956738febab9a180760d6
Merge: fe69a7e 542100d
Author: Nick Mathewson
Date: Mon Apr 6 09:55:44 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
___
tor-commits mailing list
tor-commits@lists
commit fe69a7e1d7658d3202af0c2c7308d342faaa1559
Merge: 3781955 7451b4c
Author: Nick Mathewson
Date: Mon Apr 6 09:25:37 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/bug15600 |5 +
changes/bug15601 |4
src/or/rendcommon.c |
commit 3781955f079f25f8d6aa47cb746e339497076050
Merge: 9063f29 01e4bc8
Author: Nick Mathewson
Date: Fri Apr 3 09:38:54 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/bug15515 |4
src/or/or.h |3 +++
src/or/rendmid.c | 14 +
commit b563082ad87448066f950fe581b47f1533b78341
Merge: 306f2f0 5f46a59
Author: Nick Mathewson
Date: Thu Mar 12 10:51:08 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
___
tor-commits mailing list
tor-commits@list
commit 306f2f0eff1b7d1c4bbee8b600a962d537c566f3
Merge: 64bfc29 220e9be
Author: Nick Mathewson
Date: Mon Mar 9 16:24:44 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-march2015 |3 +
changes/geoip6-march2015 |3 +
src/config/geoip
commit 1a7419c3df300483f111923daca43febc33b368b
Merge: 51e3602 6704e18
Author: Nick Mathewson
Date: Mon Mar 9 11:09:30 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/bug15083 | 10 ++
src/or/buffers.c | 11 +--
2 files changed, 19
commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59
Merge: 1525eee 2bcb596
Author: Nick Mathewson
Date: Tue Feb 24 13:24:57 2015 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
___
tor-commits mailing list
tor-commits@list
commit 1525eeeb49a4666069371a8300d6fa1c22c04de3
Merge: 7cbdec5 8e61d38
Author: Nick Mathewson
Date: Fri Feb 20 01:04:26 2015 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/ticket14487 |3 +++
src/or/config.c |2 +-
2 files changed, 4 insertion
commit 7cbdec578b291da11dcd419988ee985b7589ec48
Merge: ba17cdf df4c484
Author: Nick Mathewson
Date: Fri Jan 23 08:52:55 2015 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-january2015 |3 +
changes/geoip6-january2015 |2 +
src/config/geoip
commit 5b55778c86b88329725521d2c93829a9c9ad3501
Merge: 0872d8e 137982f
Author: Nick Mathewson
Date: Mon Nov 24 09:19:06 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-november2014 |3 +
changes/geoip6-november2014 |3 +
src/config/geoi
commit 0872d8e3cf3281fc5831375252db9e39de12e927
Merge: 6c146f9 dca902c
Author: Nick Mathewson
Date: Wed Nov 19 17:26:42 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
src/or/config.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc src/or/
commit 6c146f9c83e24dc3ae74f56f93d4e7caf570e98b
Merge: 9e2608b 0493db4
Author: Nick Mathewson
Date: Wed Nov 12 15:29:39 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
changes/bug13296 |5 +
src/or/config.c
commit af0fdb85e9f3404b735f6fbdb3fd3aa67758eb17
Merge: fd8f21e fed78bc
Author: Nick Mathewson
Date: Mon Oct 20 10:31:20 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
___
tor-commits mailing list
tor-commits@list
commit fd8f21e730ff2f9f8ace9951bf17fe357a0f8a27
Merge: ab4b296 403c6ae
Author: Nick Mathewson
Date: Sun Oct 19 15:40:07 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/bug13471 |5 +
1 file changed, 5 insertions(+)
_
commit 22b9caf0ae42132bc8107d990b3ebb969394c90f
Merge: d315b8e 943fd4a
Author: Nick Mathewson
Date: Thu Oct 16 09:08:52 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/disable_sslv3 |4
src/common/tortls.c |4 +++-
2 files changed, 7 in
commit be0e26272b3e795b902394acc9b66642fcdc1f21
Merge: 550c033 0c3b365
Author: Nick Mathewson
Date: Tue Sep 16 11:10:02 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/bug13151-client | 13 +
src/or/rendclient.c |2 +-
2 files ch
commit fa7ce6d3be62061de73176ffb939aa8d353d4014
Merge: 4056c61 b45f0f8
Author: Nick Mathewson
Date: Wed Aug 13 12:52:40 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-august2014 |3 +
changes/geoip6-august2014 |3 +
doc/tor.1.txt
commit 5c200d9be28ac9e53caac333ddd334539524d9e1
Merge: e0aa88d 303d7f5
Author: Nick Mathewson
Date: Wed Jul 23 21:28:42 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/curve25519-donna32-bug | 12 ++
src/ext/curve25519_donna/curve25519-
commit e0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da
Merge: fa8bb25 75501db
Author: Nick Mathewson
Date: Mon Jul 21 14:30:09 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-july2014 |3 +
changes/geoip6-july2014 |2 +
src/config/geoip
commit 173a1afc5819f1fcabfa34bab5714d61088cc29f
Merge: 55c7a55 f5ce580
Author: Nick Mathewson
Date: Tue Jun 10 21:09:27 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip6-june2014 |2 +
src/config/geoip|22394 ---
commit ef9c00f53962713e1f7866004f3b83a136cfcedc
Merge: 3455274 8d9602c
Author: Nick Mathewson
Date: Fri May 16 09:17:34 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22
commit defe541a3084532eb34bab82341752323cf7efca
Merge: 2d83770 411c622
Author: Nick Mathewson
Date: Wed May 7 23:12:51 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
http
commit 2d8377023781e5f7ba8152313b0fc3c0ea21e866
Merge: 683b80b 0ad8133
Author: Nick Mathewson
Date: Wed May 7 23:07:03 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
http
commit 9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2
Merge: 01e2aae 14bc6e8
Author: Nick Mathewson
Date: Thu May 1 11:45:38 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
(this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that
commit downgrades the bug 71
commit 9511522bd4c072a1d1b03b4d8e866baea3161e35
Merge: f43fee8 efab348
Author: Nick Mathewson
Date: Wed Apr 30 20:26:55 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10849_023 |6 ++
src/or/config.c |4
2 files changed, 10 insertions(+)
dif
commit 27438ef7c6a34b71165480f4d2c9173278e6d854
Merge: 545e211 35699ef
Author: Nick Mathewson
Date: Tue Apr 29 21:08:26 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
a cherry-picked backpor
commit 0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f
Merge: c0a73c8 1d3ffc0
Author: Nick Mathewson
Date: Tue Apr 29 13:03:27 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/md_leak_bug |5 +
src/or/routerparse.c |2 ++
2 files changed, 7 insertions(+)
___
commit 9fb86c82da9afff11b05783777dc83f80b835178
Merge: 7b4b137 9e44df2
Author: Nick Mathewson
Date: Wed Apr 23 11:04:10 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
This is an "ours" merge, to avoid taking the 0.2.4 version of the
__
commit 438a03ef7c1aec6a9a92a74dafe127fa3f52a4e6
Merge: 125c8e5 3fc0f9e
Author: Nick Mathewson
Date: Wed Apr 16 15:37:19 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/routerlist.c |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
commit 9556668f5fe33faec2a2de049d10061150ac6608
Merge: bc4c966 f3c20a2
Author: Nick Mathewson
Date: Tue Apr 15 14:52:12 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug11519|3 +++
src/or/circuituse.c |2 +-
2 files changed, 4 insertions(+), 1 deletion(
commit bc4c966851c16cfe3c92375fba22baf45a111a67
Merge: 0820031 1499315
Author: Nick Mathewson
Date: Mon Apr 14 18:00:54 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug11464_023 |5 +
src/or/networkstatus.c | 11 +++
src/or/routerlist.c| 3
commit 6a0dc0e585cbd9d53c91fe217adf2a4d4754694e
Merge: 08ced4a 47f7085
Author: Nick Mathewson
Date: Tue Apr 8 20:30:30 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug11437 |3 +++
src/or/dns.c |1 +
2 files changed, 4 insertions(+)
___
commit dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb
Merge: b4b9186 48578e1
Author: Nick Mathewson
Date: Tue Apr 1 21:00:30 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9213_doc |5 +
doc/tor.1.txt |5 -
2 files changed, 9 insertions(+), 1 delet
commit 0f395a7c064c314ca9dff4ac076b10461cc9b8c3
Merge: 2721246 24e0b10
Author: Nick Mathewson
Date: Thu Mar 27 15:35:11 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 2fae74d6c3e84eef24d628f55898c27a2ffa23f7
Merge: 452aa18 a83abcf
Author: Nick Mathewson
Date: Thu Mar 20 13:55:55 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
This is an "ours" merge, taking nothing, since we already had the
changes that were in a83abcf5ee
commit def0cac3ee229b65ede6e5bfecf0326cdeca02df
Merge: cce06b6 9077118
Author: Nick Mathewson
Date: Tue Mar 11 11:23:46 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit a50690e68f8a332321e88f0ac8c3046186bc1c1f
Merge: 4a2a1e5 cbf9e74
Author: Nick Mathewson
Date: Thu Mar 6 11:52:22 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9393 |4
src/or/config.c |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 2f5d7bb7e9e7ce44cb90acdc7e84d0aa77e9322b
Merge: f8e3c16 c3800f6
Author: Nick Mathewson
Date: Tue Feb 25 15:59:43 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 23a5921e9aebfa912f16bff541a9bdae5211ee86
Merge: 5015279 d7950ed
Author: Nick Mathewson
Date: Tue Feb 25 10:04:10 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-february2014-regcountry |3 +
src/config/geoip | 2399 ++-
commit 9bd77019cafcd9b8f4b76c875103093f5b4594e1
Merge: c857276 d21b24b
Author: Nick Mathewson
Date: Mon Feb 24 13:06:40 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit c0835f8e75bf23497971b860742d019f39834c58
Merge: bafae04 e616f5b
Author: Nick Mathewson
Date: Tue Feb 18 01:16:22 2014 +
Merge remote-tracking branch 'origin/maint-0.2.4'
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
_
commit bafae045ba4a117e2685a925f8a3e21e68368ed4
Merge: 3899cde 9f38cd9
Author: Nick Mathewson
Date: Mon Feb 17 23:06:34 2014 +
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10929 |6 ++
configure.ac |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit c64b549621c8354efa3c58760f63a59660dcb974
Merge: 339a47e bc58bfd
Author: Nick Mathewson
Date: Sat Feb 15 00:07:15 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-february2014 |3 +
changes/geoip6-february2014 |3 +
src/config/geoip|178
commit 339a47e80bcb898f96e41b9110dda07dd3a2fd05
Merge: 1987894 e4bc757
Author: Nick Mathewson
Date: Sat Feb 15 00:03:29 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10904 |5 +
src/common/compat.h|2 ++
src/common/container.h | 46 +++
commit 2c0088b8aa360c8dfa4c38c45d50542fa9aae8fb
Merge: 1ccc282 d6e6eab
Author: Nick Mathewson
Date: Wed Feb 12 09:17:11 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/reasons.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
_
commit 0ee449ca92dc7f25517a63b63f4d521fdd48410b
Merge: c3720c0 91d4bb0
Author: Nick Mathewson
Date: Tue Feb 11 18:58:58 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/10777_netunreach |7 +++
changes/bug10777_internal_024 |4
src/or/reasons.c
commit a73b0da653db051275311ea791098a8a9dacc98f
Merge: a0577aa 7f6aa78
Author: Nick Mathewson
Date: Sun Feb 9 21:41:59 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/channeltls.c | 26 ++
1 file changed, 26 insertions(+)
diff --cc src/or/cha
commit a0577aacb4a94e803b4d9ec266e969f1aa5a88f3
Merge: fdf6847 9bb34aa
Author: Nick Mathewson
Date: Fri Feb 7 17:41:41 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10835 |4
src/test/bench.c |4
2 files changed, 8 insertions(+)
___
commit 372adfa09a143490dfc058a6e2db78ca27ef9399
Merge: 5990edd a7e9465
Author: Nick Mathewson
Date: Fri Feb 7 10:38:24 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9602|5 ++
src/or/channeltls.c| 193 +++--
commit 5990edd1952361faca4619728b50587061d81be7
Merge: 075482f b4e8d8d
Author: Nick Mathewson
Date: Thu Feb 6 16:29:33 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
http
commit 2d41cab1502666eaace21f10385964737d246388
Merge: 1b93e3c 9e2de8c
Author: Nick Mathewson
Date: Thu Feb 6 16:12:42 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
http
commit 1b93e3c6d9802d64db7ce752717cf02ed35d1b60
Merge: 34740a1 655adbf
Author: Nick Mathewson
Date: Thu Feb 6 13:27:04 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
changes/bug10485
src/or/rephist.c
src/or/status.c
changes/bug1048
commit 3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb
Merge: 107b347 3511549
Author: Nick Mathewson
Date: Mon Dec 23 19:01:29 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10470 |4
doc/tor.1.txt|3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 6276cca8ce15c442f9eb7a45649b6bb377daefc2
Merge: 1cc3bb3 59a162f
Author: Nick Mathewson
Date: Sun Dec 22 17:26:25 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10465 |3 +++
src/or/connection_edge.c | 46 ++-
commit bbc85b18ca9c3e50fedd783e34f4a866a4960922
Merge: b98c588 2c956f0
Author: Nick Mathewson
Date: Sat Dec 21 21:16:06 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10456|6 ++
src/or/circuituse.c |2 +-
2 files changed, 7 insertions(+), 1 deleti
commit 85284c33d1952711703087eb64149ef55ea775cf
Merge: f12d3fe dabdc33
Author: Nick Mathewson
Date: Wed Dec 18 22:04:21 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/common/crypto.c
changes/bug10402| 11 +++
src/common/crypto.c
commit f12d3fe9aa3d2f97eb1750e30b812358ecdd9139
Merge: adfcc1d 561d988
Author: Nick Mathewson
Date: Tue Dec 17 13:54:02 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10423 |4
src/or/microdesc.c | 33 ++---
2 files changed
commit adfcc1da4aac9766274275460fe2252bd9ffe4eb
Merge: e6590ef 3d51545
Author: Nick Mathewson
Date: Tue Dec 17 13:18:00 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/microdesc.c
Conflict because one change was on line adjacent to li
commit 7a2b30fe16eacc040b3dd11f8c39c410628c2f43
Merge: 4aa9aff 59f50c8
Author: Nick Mathewson
Date: Fri Nov 15 15:35:00 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/relay.c
Conflict changes were easy; compilation fixes required wer
commit ff08b9b231d5b6625587865584843134bf1a4d67
Merge: fc5a881 a82b18f
Author: Nick Mathewson
Date: Mon Nov 11 10:50:05 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug10124 |3 +++
1 file changed, 3 insertions(+)
__
commit fc5a881bd3bd635be897fafdd4f9a30d5b2bed14
Merge: e30fb0a 8bfa596
Author: Nick Mathewson
Date: Sun Nov 10 12:24:12 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
doc/tor.1.txt |5 +++--
src/or/config.c | 22 +++---
src/or/router.c |4 ++--
3
commit dde41fa1b00151e01e11341903069f5b2f0db1b7
Merge: 275ab61 5cc155e
Author: Nick Mathewson
Date: Thu Oct 31 16:10:19 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 8676a08362a192f17f2850359b16933c2a5786dd
Merge: 61029d6 db2c2a6
Author: Nick Mathewson
Date: Thu Oct 31 14:08:57 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
Do an "ours" merge to not take the 0.2.4 fix for #9731
__
commit 61029d69269d58e530028ee69b148581d3d8bd93
Merge: a19e3e2 1b312f7
Author: Nick Mathewson
Date: Thu Oct 31 14:03:01 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9780 |8
doc/tor.1.txt |2 +-
src/common/tortls.c |4 +---
3 files
commit a19e3e26f467ecbf31f2c4174d699cd1989caf7a
Merge: 4c60819 0e8ee79
Author: Nick Mathewson
Date: Thu Oct 31 13:26:33 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 64293135df7611b7caa939eee57a8f0b9d29e617
Merge: f96a8d5 7ef2939
Author: Nick Mathewson
Date: Fri Oct 11 11:17:18 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-october2013 |3 +
src/config/geoip | 2019 ---
commit df4693fed57d0a0026186beaa6bb819b854c5b10
Merge: 3d817fa 2c7ed04
Author: Nick Mathewson
Date: Thu Oct 10 11:24:16 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9644 |4
src/or/routerlist.c | 29 ++---
2 files changed,
commit 3d817fa29cb9a0f58dd641aabf7f34301bf5809d
Merge: 97285bc 7b1b8c3
Author: Nick Mathewson
Date: Thu Oct 10 11:18:17 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
src/common/util.c|4 ++--
src/test/test_util.c |1 +
2 files changed, 3 insertions(+), 2 deletio
commit 97285bc46550ba135a2567d89351159da8db99f8
Merge: 3b6c483 1137817
Author: Nick Mathewson
Date: Thu Oct 10 10:55:58 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9928 |6 ++
src/common/util.c | 10 +-
2 files changed, 11 insertions(+), 5 d
commit 0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66
Merge: 882fb83 73a0bb1
Author: Nick Mathewson
Date: Wed Oct 9 12:07:01 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
Use "ours" strategy to avoid taking 73a0bb16b9b750be9a51470ff5
from 0.2.4. We _do_ want to keep t
commit 882fb8383da941ec8bec7a698caacd5924f25892
Merge: 9de456a 270dcc9
Author: Nick Mathewson
Date: Wed Oct 9 09:45:21 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/9854 |3 +++
doc/tor.1.txt | 10 +++---
src/config/torrc.sample.
commit 9de456a303f1931bef43e5a48afdf08293279c45
Merge: 30b8fc3 b8abade
Author: Nick Mathewson
Date: Tue Oct 8 16:47:49 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9904 |4
src/common/address.c |2 ++
2 files changed, 6 insertions(+)
_
commit 30b8fc3e0d5a2eafa052672619c733f3fa3d
Merge: 66624de fa1034c
Author: Nick Mathewson
Date: Tue Oct 8 16:09:45 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
Using "ours" strategy since we already merged the equivalent of #9866
into this branch.
_
commit 66624ded3973ef9ad1e5fa5a3db53344186430e3
Merge: b571b96 50fc8fb
Author: Nick Mathewson
Date: Tue Oct 8 13:38:47 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/relay.c
changes/bug9927|4
src/or/directory.c |2 ++
src/
commit 1060688d2a351329ad6a4b751e312242b57531a0
Merge: 5e04042 7e0f1fa
Author: Nick Mathewson
Date: Tue Oct 8 12:17:14 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug6979 |4
src/or/router.c |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 5e0404265fd0e1f297b4b587419870fcd58a9d7c
Merge: 63234b1 0c3c475
Author: Nick Mathewson
Date: Tue Oct 8 12:11:37 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9596 |4
src/or/policies.h |7 ---
2 files changed, 8 insertions(+), 3 deletion
commit 566645b5edb25aec55e6dffaf6f522456f661a9e
Merge: e65b54e 0bec652
Author: Nick Mathewson
Date: Wed Oct 2 22:40:01 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9880 |8
src/or/channel.c |7 ++-
src/or/channel.h |3 +++
3 files chang
commit 759de9f756cac3fb4034bfbbb7fd5195c0b24a34
Merge: 31f6806 938ee9b
Author: Nick Mathewson
Date: Tue Sep 24 10:47:26 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9776|5 +
src/or/channel.c |9 -
src/or/connection_or.c | 10
commit 5b1c257d9aea56b66b9069c8593fb9a4f00192a3
Merge: c4031ee 116e6af
Author: Nick Mathewson
Date: Mon Sep 23 01:48:30 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/rendclient.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
__
commit c4031ee847ab834445d809ace0efc09b9fd46c7c
Merge: 99703c9 d1dbaf2
Author: Nick Mathewson
Date: Sat Sep 21 08:55:45 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/connection_or.c |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
__
commit 6178aaea0698d7f62754c2aa1574ad7fd4fa781d
Merge: ee01e41 07bb171
Author: Nick Mathewson
Date: Fri Sep 20 11:01:10 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/no_client_timestamps_024 | 14 ++
doc/tor.1.txt| 12 +++-
commit 3892e03cfc1a17a8a82a931bdd62c5649752ee45
Merge: 147a0f3 ace95c5
Author: Nick Mathewson
Date: Mon Sep 16 12:48:45 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-september2013 |3 +
src/config/geoip|12806 ++-
commit d5e9573ed24df7c0eb795617de9db2a0c3e40b4d
Merge: 386e9fb a60d21a
Author: Nick Mathewson
Date: Wed Sep 4 16:11:20 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/circuituse.c
changes/bug9671_023 |5 +
src/or/circuituse.c |4
commit 9b2a0f5c755b0dc4a93c6a77e3f6bdb59a3ba96c
Merge: 5c9008e a8e76de
Author: Nick Mathewson
Date: Tue Sep 3 15:41:50 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9400 |7 +++
src/common/compat.c | 14 +++---
2 files changed, 14 insertions
commit 2452302354fdd6d34e1637380ffc73af067fd904
Merge: 0fd8f57 a5610cf
Author: Nick Mathewson
Date: Sun Aug 25 00:34:23 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9366|4
changes/bug9543|4
changes/bug9546| 11 ++
commit 223c7da080713691531817bbf8b61589aa0a67ff
Merge: eb79dd4 43f187e
Author: Nick Mathewson
Date: Thu Aug 22 20:47:23 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9564|5 +
src/or/networkstatus.c |2 +-
2 files changed, 6 insertions(+), 1 d
commit 28485d33ca64ee3989f6993a1c30f265be9e324f
Merge: ca6949e edaea77
Author: Nick Mathewson
Date: Fri Aug 16 22:00:14 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/doc-heartbeat-loglevel |3 +++
doc/tor.1.txt |2 +-
2 files changed, 4 inse
commit 5d706dd27a9d439175051ab5977e0474d669fde2
Merge: 4361795 3433b7c
Author: Nick Mathewson
Date: Mon Aug 12 09:47:17 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-august2013 |3 +
src/config/geoip | 9207 +++--
commit 83a859e24ced67663ea46f3bd05d53b29f6797c0
Merge: 5405688 0a0f93d
Author: Nick Mathewson
Date: Wed Jul 31 21:49:30 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9354 |5 +
doc/tor.1.txt |6 --
src/or/config.c |2 +-
src/or/e
commit 3842c1f5c99ea2de2656692a7c168daab29f855d
Merge: 904a58d 5a5147d
Author: Nick Mathewson
Date: Wed Jul 31 14:03:05 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 221a0159b81707f7cfcb3ec34c21830e9ce8aca5
Merge: 5d4b501 8d0fb3a
Author: Nick Mathewson
Date: Fri Jul 26 15:42:10 2013 +0200
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9337 |4
src/or/dns.c|8
2 files changed, 8 insertions(+), 4 deletions(
commit e1d3b444952d861e4fbe01b5a9b0bd2985892f41
Merge: f45e1fb 17a9607
Author: Nick Mathewson
Date: Thu Jul 18 23:17:57 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9295 |4
src/or/config.c |1 +
2 files changed, 5 insertions(+)
___
commit f797ac465fa474bc530d76dd92e499584be18ca3
Merge: 4824f3a c36bdbd
Author: Nick Mathewson
Date: Tue Jul 16 14:49:41 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9254 |4
src/or/circuitlist.c |6 --
2 files changed, 8 insertions(+), 2 de
commit fab99844fc324b2c9d415b1b1c192a25cf1c4230
Merge: dd90ab4 7a4145c
Author: Nick Mathewson
Date: Mon Jul 8 11:35:48 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9200 |5 +
src/or/dirvote.c | 14 --
2 files changed, 17 insertions(+), 2 d
commit 20634fac5475c840478755101f0e92659accfd6b
Merge: f631b73 c78c8de
Author: Nick Mathewson
Date: Mon Jul 8 09:23:09 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-july2013 |3 +
src/config/geoip | 2201 +++---
1 - 100 of 191 matches
Mail list logo
