df4c484021
Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4
2015-01-23 08:52:35 -05:00
dbd5a9a8f9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-01-23 08:52:20 -05:00
a9ce0cd659
Update geoip6 to the January 7 2015 database.
2015-01-22 09:58:29 +01:00
c3f8f5ab0e
Update geoip to the January 7 2015 database.
2015-01-22 09:56:54 +01:00
ceb6dee465
Increase limit for status vote download size by a factor of 5.
...
We've started to hit the limit here. We introduced the limit in
0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way
to not actually do the behavior this permits. See #14267 for a ticket
about fixing that.
2015-01-18 15:25:29 -05:00
ba17cdfb0a
fix another mingw64 unit test warnin
2015-01-16 11:49:58 -05:00
2329d9fe37
Fix a compilation warning in the unit tests
2015-01-15 12:56:57 -05:00
746bb55851
Ignore warning for redundant decl in openssl/srtp.h
...
Backports some commits from tor master.
2015-01-15 12:38:08 -05:00
f2fb85f970
Remove needless strdup in addressmap_register_virtual_address()
...
Fixes bug 14195. Bugfix on 0.1.0.1-rc.
2015-01-13 12:24:42 -05:00
c9dd2d1a6a
Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5
2015-01-12 00:59:29 -05:00
b08cfc65a7
Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value
...
Check for a missing option value in parse_virtual_addr_network
before asserting on the NULL in tor_addr_parse_mask_ports.
This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]]
when no value follows the option.
Bugfix on 0.2.3 (de4cc126cbfixes #14142 .
2015-01-11 11:05:00 -05:00
905287415b
Avoid attempts to double-remove edge connections from the DNS resolver.
...
Also, avoid crashing when we attempt to double-remove an edge
connection from the DNS resolver: just log a bug warning instead.
Fixes bug 14129. Bugfix on 0d20fee2fb
2015-01-08 11:00:21 -05:00
2b9d48791d
Enlarge the buffer for a line in a bw file
2015-01-07 12:44:16 +01:00
184a2dbbdd
whoops; missing changes file for 14013
2014-12-23 10:55:25 -05:00
6d728ba880
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
2014-12-22 15:58:49 -05:00
47760c7ba5
When decoding a base-{16,32,64} value, clear the target buffer first
...
This is a good idea in case the caller stupidly doesn't check the
return value from baseX_decode(), and as a workaround for the
current inconsistent API of base16_decode.
Prevents any fallout from bug 14013.
2014-12-22 12:56:35 -05:00
6830667d58
Increase bandwidth usage report interval to 4 hours.
2014-12-22 12:24:13 -05:00
4b54ad017d
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
2014-12-22 10:27:08 -05:00
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
137982f955
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
2014-11-24 09:18:36 -05:00
8d5f1e6961
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-11-24 09:18:21 -05:00
5441c733e0
Update geoip6 to the November 15 2014 database.
2014-11-24 14:23:18 +01:00
8611c6bccd
Update geoip to the November 15 2014 database.
2014-11-24 14:21:31 +01:00
0872d8e3cf
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-19 17:26:42 -05:00
dca902ceba
Update longclaw dirauth IP to be a more stable location
2014-11-19 17:22:25 -05:00
6c146f9c83
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-11-12 15:30:11 -05:00
0493db4adb
Add changes file for #13926
2014-11-12 15:25:52 -05:00
b6e7b8c88c
Remove turtles as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
ad448c6405
Add longclaw as a directory authority ( #13296 )
2014-11-12 15:25:52 -05:00
1d02f64932
Merge branch 'maint-0.2.5' into release-0.2.5
2014-10-24 09:23:29 -04:00
9e2608b0d3
bump version to 0.2.5.10-dev
2014-10-24 09:22:58 -04:00
42b42605f8
declare 0.2.3.x end-of-life more clearly
2014-10-23 22:05:54 -04:00
7fd7a2c7c3
Note 0.2.3.x deprecation
2014-10-23 15:57:37 -04:00
495d201c36
I plan to release Tor 0.2.5.10 tomorrow.
2014-10-23 12:13:45 -04:00
44b933cf01
Write a first-draft for an 0.2.5.10 blurb
2014-10-20 12:33:42 -04:00
0829e05630
Start work on summarizing 0.2.5.10 stuff. Remove a bugfix-on-0.2.5 entry
2014-10-20 12:22:29 -04:00
023ce9e0f8
Merge branch 'maint-0.2.5' into release-0.2.5
...
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
2014-10-20 10:33:18 -04:00
3202ac6006
bump maint-0.2.5 to 0.2.5.9-rc-dev
2014-10-20 10:32:09 -04:00
af0fdb85e9
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-20 10:31:20 -04:00
fed78bce8b
Whoops, bump the version properly.
2014-10-20 10:29:16 -04:00
e2112dd0c0
bump maint-0.2.4 to 0.2.4.25-dev
2014-10-20 10:24:21 -04:00
334f4f60e8
forward-port the 0.2.4.25 changelog to release-0.2.5 changelog and releasenotes
2014-10-20 10:00:49 -04:00
e6ae154ab4
Better release blurb, maybe.
2014-10-19 21:55:51 -04:00
f69c7a152f
Bump version to 0.2.5.9-rc
2014-10-19 21:45:59 -04:00
056ff52c53
Re-run format-changelog and set the release date
2014-10-19 21:40:53 -04:00
b82be6cf66
Fold 13471 into changelog and releasenotes
2014-10-19 21:39:50 -04:00
095080360f
Merge branch 'maint-0.2.5' into release-0.2.5
2014-10-19 21:38:17 -04:00
fd8f21e730
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-19 15:40:07 -04:00
403c6ae78e
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-19 15:39:48 -04:00
c1dd598df8
Note that our #13426 fix is also a #13471 fix.
...
See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2
2014-10-19 15:38:44 -04:00
Nick Mathewson
Karsten Loesing
teor
Sebastian Hahn
Micah Anderson
Roger Dingledine