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

commit 552136668c29a469d72dc7020aedddc9e9c95df4 Merge: fb5a858 3569cff Author: Nick Mathewson Date: Fri Oct 9 10:14:46 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-october2015 |3 + src/config/geoip | 7429

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

commit fb5a858a350e8801ee97e6323d0814e805d2f6ec Merge: 9d86f66 809217e Author: Nick Mathewson Date: Thu Sep 24 10:06:15 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-september2015 |3 + src/config/geoip|

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

commit 9d86f6665aaf3ef73bf93fd4f96dd861f894c5bd Merge: 9d1801b 01bb260 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 29 10:48:13 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-july2015 |3 + src/config/geoip | 2975

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

commit 418b6f8197929aaf7c532d68bd7e11aefcacaded Merge: 1c1d71f fd082c3 Author: Nick Mathewson ni...@torproject.org Date: Thu Jun 25 11:43:17 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-june2015 |3 + changes/geoip6-june2015 |3 +

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

commit c8cb55659acca96530a1d7f54bb96cac84626e17 Merge: 59fa0c2 75388f6 Author: Nick Mathewson ni...@torproject.org Date: Wed Jun 17 09:18:45 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug16360-failed-crypto-early-init |7 +++

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

commit b76314d3a1430f4440dcbec4f5026564981f2030 Merge: 95a9920 8aa0440 Author: Nick Mathewson ni...@torproject.org Date: Wed May 13 11:04:17 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' ___ tor-commits mailing list

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

commit 614d9bc9674cfb7807b0423bb43fc1c184501144 Merge: 26c344a 8aa0440 Author: Nick Mathewson ni...@torproject.org Date: Wed May 13 11:05:33 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15823 |4 src/or/rendservice.c | 18

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

commit 0ac748353a6089497908fa0817ee4d4726f01158 Merge: f620b8f 6c7720e Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 27 14:18:16 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-april2015 |3 + changes/geoip6-april2015 |2 +

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

commit 047555214056da24d682d47562a88e53563e49ff Merge: 929a8f1 fe69a7e Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 6 09:26:16 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15600 |5 + changes/bug15601 |4

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

commit eab67b06cf647e536c3ccaab7795b478413fa473 Merge: 0475552 3a5d4d6 Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 6 09:59:06 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

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

commit 354897a13e46cc06cb86eb1451a6d356d0402f42 Merge: a95e18b a00d07a Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 12 10:54:13 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

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

commit 8a060d8643ff5a84cd8593f49af8221ef0855d36 Merge: 1a1d431 eecd410 Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 12 12:27:42 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

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

commit c2dcd9b703b494b404200c6330ef9f0511b79925 Merge: 8a060d8 9063f29 Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 12 12:50:41 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 (-s ours merge to avoid taking reversion of #15064)

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

commit a7f75b2056b8bdf59d064268c53a10ac46972380 Merge: de2c5ad 1a7419c Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:09:49 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

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

commit 5c08a19eda04906cc56d6f8fa1943bc385723412 Merge: 8450f6e 64bfc29 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:23:32 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

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

commit 8450f6e9a04be27f828f27a916f6560518741ca8 Merge: fb0de57 448bd22 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:21:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/ticket14128 |5 + 1 file changed, 5 insertions(+)

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

commit 7c9be64e1af05aa1fdac894ffe9ef98f80091d57 Merge: c066f2d 306f2f0 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 16:25:11 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-march2015 |3 + changes/geoip6-march2015 |3 +

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

commit 51df1f9906510521d1641841d6687e1ab700800a Merge: fec73c8 51e3602 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 24 13:25:32 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ___ tor-commits mailing

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

commit cc6fd9833cbea1e148114af007c83906789b58ec Merge: 4a17c54 51e3602 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 24 13:25:47 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' ___ tor-commits mailing list

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

commit 03a4e97c76b2021ec7246da03fb31d337fb50f9b Merge: 5334bcd 1525eee Author: Nick Mathewson ni...@torproject.org Date: Fri Feb 20 01:05:21 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/ticket14487 |3 +++ src/or/config.c |2 +- 2 files changed, 4

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

commit d8517fe8435dbe9e4593d04fa8ec4db464513892 Merge: 4a6b43b 7cbdec5 Author: Nick Mathewson ni...@torproject.org Date: Fri Jan 23 08:53:21 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/geoip-january2015 |3 + changes/geoip6-january2015 |2 +

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

commit dcf8cddab25e5b189eaebf473423c2b31acb4525 Merge: bbad23b ba17cdf Author: Nick Mathewson ni...@torproject.org Date: Sun Jan 18 13:49:04 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' Conflicts: src/test/test_relaycell.c src/test/test_util.c

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

commit d807c7c8725acb85a6695ab399f99c2509a245c4 Merge: 3368b0c 746bb55 Author: Nick Mathewson ni...@torproject.org Date: Thu Jan 15 12:38:43 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14220 |4 1 file changed, 4 insertions(+)

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

commit 1686f81ac25328382a46ffe569db1d371f6b6be2 Merge: 518b0b3 f2fb85f Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 14 13:30:10 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14195|3 +++ src/or/addressmap.c |2 +- 2 files changed, 4

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

commit 7b51667d638242b9e47bdd0d4357596c380f7c94 Merge: b266329 b08cfc6 Author: Nick Mathewson ni...@torproject.org Date: Sun Jan 11 11:05:31 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14142-parse-virtual-addr |7 +++ src/or/addressmap.c

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

commit 2d123efe7c98765fae17af747b266ea8cc0b4b5c Merge: 2dac77c c9dd2d1 Author: Nick Mathewson ni...@torproject.org Date: Mon Jan 12 00:59:48 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14129 |7 +++ src/or/dns.c |6 +- 2 files changed, 12

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

commit 49dca8b1beae9c2dade2c3193fa7f77f5c15d869 Merge: 7c5a455 2b9d487 Author: Nick Mathewson ni...@torproject.org Date: Wed Jan 7 07:50:14 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14125 |5 + src/or/dirserv.c |2 +- 2 files changed, 6

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

commit c6ac752353e6b03b2cbf2822d8fe2c60dfb03746 Merge: dfebefe 184a2db Author: Nick Mathewson ni...@torproject.org Date: Tue Dec 23 11:00:02 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14013 |6 ++ 1 file changed, 6 insertions(+)

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

commit 0965bbd5ac3a3dc4016a0c13082506ac2039905e Merge: 03d2df6 6d728ba Author: Nick Mathewson ni...@torproject.org Date: Mon Dec 22 16:02:47 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' src/common/crypto.c |6 ++ src/common/util.c |3 +++ 2 files changed, 9

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

commit b4ead16d57fab6a8294a0bf374bfcdb0d6e02625 Merge: 6218f48 5b55778 Author: Nick Mathewson ni...@torproject.org Date: Mon Nov 24 09:19:22 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/geoip-november2014 |3 + changes/geoip6-november2014 |3 +

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

commit 5c813f6ca1d6e385cfad5219108f8ac00677cf35 Merge: 9b11dc3 6c146f9 Author: Nick Mathewson ni...@torproject.org Date: Wed Nov 12 15:32:15 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13296 |5 + src/or/config.c |6 +++--- 2 files changed, 8

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

commit 1ce57267b4dbb765dc0ce652080b60ecc013703e Merge: 9116f49 9e2608b Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 24 09:23:53 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' ___ tor-commits mailing list

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

commit d6fab2afd7f37a3a31063654a8f5451d5d290bcf Merge: c6416f3 3202ac6 Author: Nick Mathewson ni...@torproject.org Date: Mon Oct 20 10:33:53 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' This is an ours merge so we can leave the version in master alone.

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

commit 291cd50939fdd53fd2d1ee1db4a4859eb2aadae4 Merge: 6c5db03 fd8f21e Author: Nick Mathewson ni...@torproject.org Date: Sun Oct 19 15:40:25 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13471 |5 + 1 file changed, 5 insertions(+)

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

commit 33b399a7b2ecc1ea13219fde86748246d697f6fe Merge: 48af23e 22b9caf Author: Nick Mathewson ni...@torproject.org Date: Thu Oct 16 09:09:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/disable_sslv3 |4 src/common/tortls.c |4 +++- 2 files changed,

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

commit fc5cab44724e8328e2186f22114625388f1c8f0d Merge: a5cc5ad ab4b296 Author: Nick Mathewson ni...@torproject.org Date: Thu Oct 16 13:29:14 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug8093 |3 +++ src/or/relay.c |2 +- 2 files changed, 4

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

commit bbffd0a0187334c3ce80b446b08b6ea195da5063 Merge: b448ec1 d315b8e Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 3 19:58:25 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13325|4 configure.ac|4 src/common/tortls.c |

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

commit 2e607ff51931b35ee531fa60b83487b3f4f944a7 Merge: a0be2f1 e1a25f0 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 29 13:02:50 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/13295 |5 + src/common/sandbox.c| 21

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

commit feee44577133e0f76add0ae9c03d2b722f05cbb8 Merge: 1bb1035 be0e262 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 16 11:11:48 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13151-client | 13 + src/or/rendclient.c |2 +- 2

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

commit 2914d56ea4c767bbfa956afba64032c90a27f4eb Merge: 121f4a9 6215ebb Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 08:59:24 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13124 |8 src/or/config.c |4 ++-- 2 files changed, 10

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

commit 974f4d2ceb0c494bc5008749928bd2d49317cf0b Merge: 383238b 550c033 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 11 21:41:56 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' (Do an ours merge to avoid taking version number changes)

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

commit 73ee161d8a7bc06eefa58654cbfe421449921eec Merge: e07206a 3c2c6a6 Author: Nick Mathewson ni...@torproject.org Date: Wed Sep 10 23:48:59 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13096|4 src/or/routerlist.c |2 +- 2 files changed, 5

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

commit 2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab Merge: 781b477 d229025 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 8 15:16:45 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13085 |3 +++ src/or/control.c |8 src/or/control.h |4

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

commit ad0ae89b3c872ee89f4bd6096e650d4e2c855330 Merge: 2ecaa59 a3c49ca Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 9 10:22:42 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13071 |3 +++ src/or/directory.c | 12 +++- 2 files changed,

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

commit 29979082286cc8fa4dadf4e1fcbe85a1aa58d757 Merge: ad0ae89 8391c96 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 9 10:27:41 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' Makefile.nmake|4 changes/bug13081 |3 +++

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

commit 619bd43a5e2c33ebb02cbeee2dfdf255984794f8 Merge: a9d24f3 dd22ab5 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 9 10:57:09 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' ___ tor-commits mailing list

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

commit 4af88d68b4905beac168adb5f1756d610ff7ed7e Merge: 619bd43 8eed82b Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 9 11:05:28 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12160 |4 +++ src/or/channel.c | 17 +

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

commit 781b477bc8af868661450473cdebb5d70312fd61 Merge: 5434820 f551a05 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 8 15:08:51 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' .gitignore |2 ++ 1 file changed, 2 insertions(+)

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

commit e3c143f5214b4a2d37dbb47940eaf2cc2e212f86 Merge: 67c0ad5 efcab43 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 2 11:58:08 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/ticket13036 |5 + src/common/address.c |2 ++ src/or/circuitmux.c

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

commit d19cbf3ab17a5afcbe0e94a16686e9ff9129dbfc Merge: 962765a dcb4ee5 Author: Nick Mathewson ni...@torproject.org Date: Tue Sep 2 19:00:00 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' doc/tor.1.txt |5 + 1 file changed, 5 insertions(+)

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

commit 67c0ad54263be7fb742a8d499f97f5908f9ec970 Merge: 87f9c51 8139db3 Author: Nick Mathewson ni...@torproject.org Date: Mon Sep 1 16:23:34 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12878 |3 +++ 1 file changed, 3 insertions(+)

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

commit d6fa8239c86f49413e9ee86765059f43ceeb06c6 Merge: 573d627 4a6f5bb Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 29 16:13:04 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12997 |3 +++ src/or/rendmid.c | 11 +-- 2 files changed, 12

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

commit f113a263deda8e1619f46cd913fc24ac28da832d Merge: d6fa823 41058dc Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 29 16:45:56 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12996 |5 + src/or/onion_tap.c |5 +++-- 2 files changed, 8

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

commit cc3b04a8c1edbeb1a488e319e3c0d28acd227417 Merge: 9f9b19e 37a76d7 Author: Nick Mathewson ni...@torproject.org Date: Thu Aug 28 08:36:00 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12948 |8 src/or/config.c |3 ++- 2 files changed, 10

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

commit 2937de21803174e14873f68b34ba8a6c62285c45 Merge: 3d6652f b159ffb Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 18 10:20:37 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' src/or/config.c |2 ++ 1 file changed, 2 insertions(+)

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

commit 33fab2846af4079308006354f51343c7f7b4fd4a Merge: ff4ba9f 0cb028b Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 10:07:04 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' src/test/test_buffers.c |3 --- 1 file changed, 3 deletions(-)

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

commit 1f35fd0017240a82ae48475a989819aa81a297dc Merge: be231b0 967b4e7 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 17:41:13 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12864|7 +++ doc/tor.1.txt |9 -

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

commit 938deecc876e110d708edda544d20d9fd752838e Merge: bb68c73 fa7ce6d Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 13 12:52:57 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' README|9 +- changes/bug12830 |4 +

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

commit 283730ad1cdd911d1a669ea730741f35aa6b7f66 Merge: 9114346 789c8d8 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 13 15:11:52 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/test.h_msvc |3 +++ src/test/test.h |2 +- 2 files changed, 4

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

commit c69e96680a8db0d3d0c20e68f8f8d6727470ece4 Merge: 283730a d443658 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 13 23:15:44 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12848 |4 src/or/channel.c |8

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

commit bb68c731b897a967a4b7eb138728fa077617646e Merge: 374611d fcac4b4 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 8 10:09:17 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug11200-caching |7 +++ src/or/directory.c |2 +-

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

commit 0edb9b0492abbdd6c3ec397ad1f80c901568a713 Merge: f8cbba7 74a8555 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 30 14:18:11 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12730-systemd-verify-config|3 +++

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

commit dfe80c966d5136bc4f3287f4f762384ecc4df0c5 Merge: 641c158 5c200d9 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 23 21:28:58 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/curve25519-donna32-bug | 12 ++

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

commit 641c1584f7be8de88d3c58eae96c5c022a4870d1 Merge: e7e92fb e0aa88d Author: Nick Mathewson ni...@torproject.org Date: Mon Jul 21 14:30:27 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/geoip-july2014 |3 + changes/geoip6-july2014 |2 + src/config/geoip

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

commit a36cd51b59f3fbd99041904ac5b963a296aabefb Merge: 7259e3f f6a776d Author: Nick Mathewson ni...@torproject.org Date: Thu Jul 17 11:34:33 2014 +0200 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug12602|5 + src/common/tortls.c |2 ++ 2 files changed, 7

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

commit 7591ce64fbaae8d480224a93d62abda10011c2ba Merge: 7bc7188 9e46855 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 11:01:20 2014 +0200 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bufferevent_compilation |5 changes/bug8387 | 11