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

commit af082895ec3ca700a329d22c46ec454a65b31703 Merge: b346d43c9 6199e27a2 Author: Nick Mathewson Date: Tue Aug 1 11:19:28 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-july2017 | 4 + src/config/geoip | 10075

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

commit b346d43c9775c350b12d4ea5392d58b0cdaa933c Merge: 8374e3e19 ebb441ded Author: Nick Mathewson Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 8374e3e1943166f25f5c96970a4b8ac6101dbfc1 Merge: 37abaa5a1 6d0af8dac Author: Nick Mathewson Date: Wed Jul 26 15:38:48 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 .travis.yml | 88

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

commit 37abaa5a14d3c3336632760e616651f1d3e21316 Merge: 0331e28 b47249e Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

commit 0331e287741e53277ba9a444644cb71a711f395d Merge: 6a36221 0ee15c9 Author: Nick Mathewson Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c |

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

commit 6a3622154e2f5f8f481422caebaf2c09a6d91233 Merge: 404a094 d56f699 Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files

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

commit 404a094142f713aca906e1bcab52623b677ad346 Merge: b2cab96 104e8fa Author: Nick Mathewson Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-june2017 |4 + src/config/geoip | 5079

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

commit b2cab96029e2ea477215690d0bb403565e13ac56 Merge: f833164 ec3ce77 Author: Nick Mathewson Date: Thu Jun 8 14:06:56 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 5ac469d795aebb5f77090648969c9eb7f7133015 Merge: cdb58af 8e439a6 Author: Nick Mathewson Date: Thu Jun 8 09:29:48 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit cdb58af90d26452be60781355fbf40f7328735bd Merge: 98f6100 56a7c5b Author: Nick Mathewson Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/trove-2017-005 | 7 +++ src/or/relay.c | 3 ++- 2 files changed, 9

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

commit 98f610068f669cabbd2fde764c79e8c9d0481976 Merge: df23e28 4ee48cb Author: Nick Mathewson Date: Mon Jun 5 14:38:48 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit df23e280c4419762b3c800badd5992d84ee8797c Merge: cdc960b e3ebae4 Author: Nick Mathewson Date: Mon Jun 5 11:59:57 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1

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

commit cdc960b538d677c5434a91eec7b25a93c93df0fa Merge: d92e622 5207e41 Author: Nick Mathewson Date: Mon May 8 08:07:56 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-may2017 |4 + src/config/geoip | 5862

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

commit d92e622b41927872f47942c71149a1810c5735ed Merge: 64bc149 9d79332 Author: Nick Mathewson Date: Thu Apr 6 08:32:31 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-april2017 | 4 + src/config/geoip| 14366

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

commit 64bc1490ea4a106ceb10c42273124790538bbcb7 Merge: 16bbbe8 4488c31 Author: Nick Mathewson Date: Wed Mar 8 10:09:20 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-march2017 | 4 + src/config/geoip| 13115

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

commit 70840ea6d53c4bbfd202ce3c83ea398e5a68822b Merge: e9d45f6 4bab288 Author: Nick Mathewson Date: Tue Feb 28 10:21:58 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 2afdf8de2f8a71e6a7de24546a03e505f4258aff Merge: 92f8b56 194e310 Author: Nick Mathewson Date: Wed Feb 15 07:50:45 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug20384 | 10 ++ changes/trove-2017-001.2 | 8

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

commit 92f8b56e27450f3646ea1b2a5751fce9e77beb86 Merge: 8bcc14f f601605 Author: Nick Mathewson Date: Mon Feb 13 14:39:10 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-february2017 | 4 + src/config/geoip | 10832

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

commit 8bcc14f62e620c4a15084449c335680096511001 Merge: 9c5ff56 85a2487 Author: Nick Mathewson Date: Tue Feb 7 10:39:48 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug16248 | 8 src/or/main.c| 55

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

commit 9c5ff56659fc0636adfd9f1448cc0167f53e7eec Merge: a2192a6 e4a4224 Author: Nick Mathewson Date: Tue Feb 7 09:21:10 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2

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

commit a2192a671c9038026696f079184c4358fb70d443 Merge: 040d7ce d6eae78 Author: Nick Mathewson Date: Tue Feb 7 08:56:58 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/rsa_init_bug | 7 +++ src/common/crypto.c | 4 +++- 2 files changed, 10

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

commit 040d7cecf39c06ee705a97c90d546d34d6c115ab Merge: d7810bb 51675f9 Author: Nick Mathewson Date: Tue Feb 7 08:40:00 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug15823 | 4 changes/bug17404 | 6 ++ changes/bug18089 |

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

commit d7810bb4a35cc0d0359b26856e1adeaf5c2bfdf8 Merge: 956c61e 3833f67 Author: Nick Mathewson Date: Wed Jan 11 09:11:44 2017 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-january2017 |4 + src/config/geoip | 3160

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

commit 956c61ec23e8e4861f852473292c2c54abb7f614 Merge: ec3df7c 8f857c2 Author: Nick Mathewson Date: Tue Dec 20 18:19:18 2016 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 src/or/buffers.c | 31 --- 1 file changed, 28 insertions(+),

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

commit ec3df7cbd2d122d66bab7c389715ff9579eb0899 Merge: ce12cde 0fb3058 Author: Nick Mathewson Date: Tue Dec 20 18:05:47 2016 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug21018 | 11 +++ src/or/rendcommon.c | 6 --

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

commit ce12cde92c023f8ce5d227a7526c01279cbce132 Merge: bd44053 9db47e7 Author: Nick Mathewson Date: Fri Dec 9 08:34:39 2016 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-december2016 |4 + src/config/geoip | 6259

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

commit bd440537169728a626c3d38c2ad14d800898f617 Merge: 0e2f188 ea59783 Author: Nick Mathewson Date: Mon Nov 7 09:29:37 2016 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-august2016| 4 + changes/geoip-july2016 | 4 +

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

commit 0e2f18868cc7634cf4ef8bc7823f61cd301497ba Merge: fd6ba23 6b8c3d2 Author: Nick Mathewson Date: Tue Jul 5 13:51:28 2016 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

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

commit fd6ba23f7bb4c47cedbfd65053b1148659b9d863 Merge: ef996c9 7ae34e7 Author: Nick Mathewson Date: Tue Jul 5 12:25:03 2016 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-jun2016 |4 + src/config/geoip | 3349

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

commit ef996c91b84e0eacb6773f1b63fb3837229c99ab Merge: 8e6174e 3c2d461 Author: Nick Mathewson Date: Mon May 9 14:55:14 2016 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-may2016 |4 + src/config/geoip | 6991

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

commit 8e6174e38906105e32690c54936eef19e0946103 Merge: 7bb4422 97c6e71 Author: Nick Mathewson Date: Thu Apr 7 10:46:22 2016 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug18162 | 7 + changes/geoip-april2016| 4 +

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

commit 7bb4422a93eb347a944a25e1451c882e3060d5cb Merge: a378b22 11f63d2 Author: Nick Mathewson Date: Thu Jan 7 09:47:36 2016 -0800 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug17772|7 + changes/bug17781|3 +

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

commit 7d5ddde4872d87cdc28f203ede8ff4038efa9886 Merge: da85052 542100d Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 6 09:49:06 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h

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

commit 22bdc694290c48e959a44e9937d04b0b576e765d Merge: 9e44ed4 5f46a59 Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 12 10:50:28 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 configure.ac |2 +- contrib/tor-mingw.nsi.in |2 +-

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

commit b70a0a01ec99064e23ccf56c7ff6d0bec397b2f7 Merge: dc06c07 6704e18 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 13:37:22 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +-- 2 files changed, 19

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

commit 5ba8ab5a88b36c05986fee1535d4615024974e6d Merge: ef5f2b3 220e9be Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 16:24:20 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-march2015 |3 + changes/geoip6-march2015 |3 + src/config/geoip

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

commit a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5 Merge: 6b2ed1a e2112dd Author: Nick Mathewson ni...@torproject.org Date: Mon Oct 20 10:26:19 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: configure.ac changes/bug13471 |5 + configure.ac |

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

commit 1f5b228ee89f237fa653313fb1824b60a717441f Merge: a8d6eb3 fed78bc Author: Nick Mathewson ni...@torproject.org Date: Mon Oct 20 10:30:58 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: contrib/tor-mingw.nsi.in src/win32/orconfig.h

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

commit 929dd87c35a2f0e149f808805d1169047627e9af Merge: 598c613 288b3ec Author: Roger Dingledine a...@torproject.org Date: Mon Sep 22 13:11:38 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug13100 |3 + changes/bug13151-client | 13 +

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

commit 637b4e62d1cd8ebec4092031dc2664c643a3e619 Merge: 911fb93 68a2e4c Author: Roger Dingledine a...@torproject.org Date: Mon Jul 28 03:09:12 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug1038-3 |6 ++ changes/bug12227 |5 + changes/bug12718

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

commit 598c61362f1b3d3e3a93d15240c7306d955273be Merge: 9ac1695 fcbb21b Author: Roger Dingledine a...@torproject.org Date: Mon Jul 28 04:08:18 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: configure.ac contrib/tor-mingw.nsi.in

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

commit 911fb9399fdd88a51222779268ffc55ab12a18ac Merge: dd4f5bc 71c62b1 Author: Roger Dingledine a...@torproject.org Date: Thu Jul 24 16:22:36 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/curve25519-donna32-bug | 12 ++ changes/ticket12688

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

commit 2998d384ec23677693b5894118d92efd0208dd5b Merge: 9959bc5 75501db Author: Roger Dingledine a...@torproject.org Date: Mon Jul 21 14:39:48 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-july2014 |3 + changes/geoip6-july2014 |2 +

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

commit 9959bc54e1210644af83ef5dde6c66e2641661ed Merge: 2ee56e4 8d9602c Author: Roger Dingledine a...@torproject.org Date: Sat May 17 04:36:17 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 This is an ours merge, to avoid taking the commit that bumped maint-0.2.4's

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

commit 4e0bd2428740bda66597606b0ba04b5346ab49fd Merge: 5059627 9e44df2 Author: Roger Dingledine a...@torproject.org Date: Wed Apr 23 13:47:07 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug11437 |3 +++ changes/bug11464_023 |5 +

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

commit 4ef52cc16759eb75523b9694d75d051c01ba994c Merge: 4428a14 d7950ed Author: Roger Dingledine a...@torproject.org Date: Tue Feb 25 15:05:06 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/10777_netunreach |7 + changes/bug10777_internal_024 |

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

commit ed960eaa16b23e42e7d959139e0001ef60aaee79 Merge: dab4656 c3800f6 Author: Roger Dingledine a...@torproject.org Date: Tue Feb 25 16:37:44 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10870 |6 src/or/or.h | 19 - src/or/relay.c |

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

commit 911e0a71a609864e1a10f6cc0ca5f16661f15ece Merge: d9c111d 7f6aa78 Author: Roger Dingledine a...@torproject.org Date: Mon Feb 10 16:41:13 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10485 |4 + changes/bug10793 |4 + changes/bug10835 |

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

commit d9c111d954c6b3b7cd4704b4bec8d830ffa056f6 Merge: 3cb5c70 3511549 Author: Roger Dingledine a...@torproject.org Date: Thu Feb 6 12:28:49 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10470 |4 doc/tor.1.txt|3 ++- 2 files changed, 6

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

commit ce43072831250eb5e0a089bd2cf092c34701eebf Merge: 9f7be02 59a162f Author: Roger Dingledine a...@torproject.org Date: Sun Dec 22 18:31:50 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10465 |3 +++ src/or/connection_edge.c | 46

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

commit 2349833f71941e96a1bbdcf22c4645cef4ac3ced Merge: e719d05 2c956f0 Author: Roger Dingledine a...@torproject.org Date: Sun Dec 22 02:25:53 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10402 | 11 +++ changes/bug10409 |3 +++

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

commit 5d1a004e0dd0ef33f60985c47f86c255a3404a0f Merge: f503f30 59f50c8 Author: Roger Dingledine a...@torproject.org Date: Fri Nov 15 17:10:31 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10124 |3 +++ changes/bug9093 |7 +++ src/common/util.c

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

commit 6837a270250a52ee1189cb17f00e29cfa3070e73 Merge: 33b8607 8bfa596 Author: Roger Dingledine a...@torproject.org Date: Sun Nov 10 21:51:31 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 doc/tor.1.txt |5 +++-- src/or/config.c | 22 +++---

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

commit 33b86071b765b6254f5aab13fc6dceebe206b103 Merge: 00f95c2 5cc155e Author: Roger Dingledine a...@torproject.org Date: Sat Nov 2 06:35:46 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug6055 |6 ++ changes/bug9645a|5 + changes/bug9731 |

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

commit 7067f53d424820566c41412c637177b823a52c10 Merge: fd35354 8f9fb63 Author: Roger Dingledine a...@torproject.org Date: Wed Oct 16 18:51:15 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9946 | 11 + changes/geoip-october2013 |3 + src/config/geoip

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

commit b9d11bd87c292ef4a7bb785ef305a59afab37865 Merge: 63bef6c eb5d75e Author: Roger Dingledine a...@torproject.org Date: Thu Oct 10 21:42:33 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 ChangeLog|5 +- changes/9854 |3 + changes/bug6979 |4

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

commit 8fd9644f172a03f87a67cbfb69110bff2353f95b Merge: 00fb525 938ee9b Author: Roger Dingledine a...@torproject.org Date: Mon Sep 30 00:46:57 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9776 |5 + changes/geoip-september2013 |3 +

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

commit 60f13485ebd70443a16ab083971073dbb6bdadcf Merge: 63b9118 2c877d2 Author: Roger Dingledine a...@torproject.org Date: Thu Sep 5 01:47:47 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/ticket9658 |4 src/or/command.c |3 +++ src/or/cpuworker.c |5

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

commit a1963695cada32e3728f44ad585a7453ec7ffe3b Merge: 00ca2cc a5610cf Author: Roger Dingledine a...@torproject.org Date: Sat Aug 31 20:10:58 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9366|4 + changes/bug9543|4 +

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

commit 42335972d5f73c18b59459201d80f4e769cc2a5b Merge: a2ea9df d5cfbf9 Author: Roger Dingledine a...@torproject.org Date: Sat Aug 10 18:00:47 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/v3_intro_len |8 src/or/rendservice.c | 10 ++

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

commit 27fbfbbe7cc18477f828bd121e046c5547fb1000 Merge: f473dec 0a0f93d Author: Roger Dingledine a...@torproject.org Date: Mon Aug 5 02:49:40 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9288 |4 changes/bug9354 |5 + doc/tor.1.txt |

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

commit 4a1d9726f4d6e212ec2f0e1ac90a3f09ca27c853 Merge: 2b9fb51 8d0fb3a Author: Roger Dingledine a...@torproject.org Date: Sun Jul 28 09:50:19 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9309 |6 ++ changes/bug9337 |4 src/or/channel.c|

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

commit bc6c7ea74ec1b62c7a6ca817e9c5695bafc57af3 Merge: e7b4358 0eca873 Author: Roger Dingledine a...@torproject.org Date: Thu Jul 18 23:36:05 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9200|5 + changes/bug9254|4 + changes/bug9295|

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

commit e9f0cdf55fe22a83e5bffd51189fc2e5752669e7 Merge: 7b29838 81a5ee7 Author: Roger Dingledine a...@torproject.org Date: Mon Jul 1 15:08:57 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9122 |4 changes/bug9147 |4 src/or/config.c |4

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

commit d78bb2df0ee9366efc5b25a40684d7ab9451da37 Merge: e86f122 8b6d0bd Author: Roger Dingledine a...@torproject.org Date: Fri Jun 14 04:07:30 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug8639 |5 ++ changes/bug8822 |5 ++

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

commit b4b14921da4a81b5ed2cdafd5b7ff230b298edd4 Merge: a7958a7 607b29a Author: Roger Dingledine a...@torproject.org Date: Mon Jun 10 15:01:25 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9017 |6 ++ src/or/connection_edge.c | 11 ++- 2

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

commit 34c70ba9e62cc28c3bfe363c1c34a2f0fbf2dba4 Merge: 2d4aeba c860a96 Author: Roger Dingledine a...@torproject.org Date: Sat Jun 8 15:12:29 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-june2013 |3 + doc/tor.1.txt |4 +- src/config/geoip

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

commit 2d4aebaf762f022a46932c9f56cbe8802d99c3da Merge: 91b8bc2 30c06c1 Author: Roger Dingledine a...@torproject.org Date: Fri May 24 23:58:16 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug5595|8 + changes/bug6026|4 + changes/bug7982

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

commit b4d81f182c7a01e6099dc4e8afe4349c039be745 Merge: 887eba9 a6545d6 Author: Roger Dingledine a...@torproject.org Date: Tue Apr 16 11:09:50 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug5650 |5 + changes/bug7302 | 11 +++

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

commit 0eb141c4164df0b4fc5cbbaa5b86e70f294e2cb2 Merge: b4d81f1 b00a621 Author: Roger Dingledine a...@torproject.org Date: Wed Apr 17 11:19:51 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug7143 |4 changes/bug8037 |8 src/common/util.c

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

commit 887eba98950f2974bd2031510e1ece2279a4f106 Merge: fcd9248 6acf0ac Author: Roger Dingledine a...@torproject.org Date: Thu Apr 11 01:29:24 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug6174|6 + changes/bug6206

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

commit 790ddd6e0af1be48dc842a28c1599a6027f85b30 Merge: f0a5f91 ef4db31 Author: Roger Dingledine a...@torproject.org Date: Mon Mar 11 14:02:26 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-mar2013 |3 + src/config/geoip |92875