796563f7f3
Actually merge the CVE-2011-2778 log entry into ChangeLog
2011-12-15 13:14:50 -05:00
7264e0d880
Increment release to 0.2.2.35
2011-12-15 12:02:38 -05:00
d4b935e77f
Changelog for 0.2.2.35
2011-12-15 11:56:26 -05:00
2c70ca0e94
Merge branch 'maint-0.2.2' into release-0.2.2
2011-12-15 11:38:40 -05:00
562c974ee7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-12-15 11:28:44 -05:00
9d0777839b
Add a fix for the buf_pullup bug that Vektor reported
2011-12-15 11:28:24 -05:00
ed46539050
Merge changes files for 0.2.2.35; start work on a blurb
2011-12-14 16:01:33 -05:00
9fdfc10092
Merge branch 'maint-0.2.2' into release-0.2.2
2011-12-08 17:23:58 -05:00
0582746e0d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-12-08 04:40:15 -05:00
ff2c9acbb3
Update to the December 2011 GeoIP database.
2011-12-08 09:55:44 +01:00
6171bdd105
Don't call tor_tls_set_logged_address till after checking conn->tls
...
Fixes bug 4531; partial backport of e27a26d5
2011-12-02 16:15:52 -05:00
2b5a035604
tor_accept_socket() should take tor_addr_t for listener arg
...
Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un"
2011-12-02 16:09:16 -05:00
b7015603fa
Fix bug 4530; check return val of tor_addr_lookup correctly
...
Fix on 0.2.1.5-alpha; reported by troll_un
2011-12-02 15:37:24 -05:00
5ad0de1e5d
unify changelog stanzas
2011-11-27 03:52:24 -05:00
52789c863e
fold in one more
2011-11-27 03:35:15 -05:00
57db578b81
Merge branch 'maint-0.2.2' into release-0.2.2
2011-11-27 03:33:11 -05:00
3ebe960f3f
Detect tor_addr_to_str failure in tor_dup_addr.
...
This avoids a possible strdup of an uninitialized buffer.
Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un.
2011-11-23 23:04:10 -05:00
fbf1c5ee79
Merge remote-tracking branch 'public/bug4230' into maint-0.2.2
2011-11-23 16:22:26 -05:00
841247a586
Fix a compile warning on 64bit OS X
...
Backport of 68475fc5c5
2011-11-23 12:06:55 -05:00
842a7a8123
fold in more changes files
2011-11-21 19:30:29 -05:00
3f41df3005
Merge branch 'maint-0.2.2' into release-0.2.2
2011-11-21 19:18:09 -05:00
97a209ea28
man page entries for AuthDir{Fast,GuardBW}Guarantee
2011-11-21 18:32:32 -05:00
c0ec4eafc5
parameterize bw cutoffs to guarantee Fast and Guard flags
...
Now it will be easier for researchers to simulate Tor networks with
different values. Resolves ticket 4484.
2011-11-21 18:22:10 -05:00
f4e053d6df
Merge branch 'bug4518' into maint-0.2.2
2011-11-21 17:25:51 -05:00
b3c988f0d7
Merge remote-tracking branch 'public/bug3963' into maint-0.2.2
2011-11-21 10:52:15 -05:00
8955b25fc1
fold in further changes entries
2011-11-20 22:08:12 -05:00
fbcd7c01e7
Changes file for bug4521 backports.
2011-11-20 20:15:13 -05:00
509d7e02e9
Merge branch 'maint-0.2.2' into release-0.2.2
2011-11-20 15:08:07 -05:00
2efa6eb652
Sockets are unsigned on windows
...
this gets rid of a warning about signed/unsigned comparison
This is a backport of 0a5338e03c
2011-11-20 15:15:14 +01:00
3dc2a1c62c
Get rid of an unused parameter warning on win
...
This is a backport of bed79c47f4
2011-11-20 03:02:28 +01:00
8e388bc39c
Only call cull_wedged_cpuworkers once every 60 seconds.
...
The function is over 10 or 20% on some of Moritz's profiles, depending
on how you could.
Since it's checking for a multi-hour timeout, this is safe to do.
Fixes bug 4518.
2011-11-19 18:30:55 -05:00
6ef44b7849
Don't log about stats when running as a client without geoip
...
Completely disable stats if we aren't running as a relay. We won't
collect any anyway, so setting up the infrastructure for them and
logging about them is wrong. This also removes a confusing log
message that clients without a geoip db would have seen.
Fixes bug 4353.
2011-11-19 00:50:03 +01:00
5a02406ae0
Merge branch 'bug4457_022' into maint-0.2.2
2011-11-16 16:22:47 -05:00
5bea660f8e
Use real_addr in send_netinfo
...
Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349.
2011-11-14 22:43:40 -05:00
0f6c021617
Detect failure from event_init() or event_base_new_with_config()
2011-11-14 17:53:45 -05:00
7363eae13c
Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation
...
In Tor 0.2.2, we never need the event base to be notifiable, since we
don't call it from other threads. This is a workaround for bug 4457,
which is not actually a Tor bug IMO.
2011-11-14 17:48:57 -05:00
2b7bdc295a
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-14 11:10:27 -05:00
13f02c387f
Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1
2011-11-14 11:10:10 -05:00
e1c6431e42
Correct the handling of overflow behavior in smartlist_ensure_capacity
...
The old behavior was susceptible to the compiler optimizing out our
assertion check, *and* could still overflow size_t on 32-bit systems
even when it did work.
2011-11-09 14:48:52 -05:00
8adec87050
Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
2011-11-09 11:03:20 -05:00
0cc7a63fc0
Don't warn when compiling with --disable-threads
...
STMT_VOID semantics suggested by nick, thanks!
2011-11-09 10:26:35 +01:00
565463243c
Include HiddenServiceDir in some warning messages
2011-11-07 17:02:50 -08:00
8ba1cf3007
Robert says that this bug was not in fact one of frosty's
2011-11-07 11:54:54 -05:00
ca282e5326
Merge branch 'bug4424' into maint-0.2.2
2011-11-07 11:47:28 -05:00
02d89c5c66
Remove an extraneous "if" in the 4424 fix
2011-11-07 11:46:51 -05:00
65a0d7e7ef
Don't leak an extend_info_t in rend_client_any_intro_points_usable
2011-11-07 08:35:51 -08:00
4d8306e0e9
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-07 10:42:34 -05:00
6d45c6d548
Update to the November 2011 GeoIP database.
2011-11-07 14:23:48 +01:00
be6928d6e7
Add a changes file for 4410
2011-11-06 18:00:10 +01:00
d5161ab895
Fix remotely triggerable assert during ip decryption
...
Fixes bug 4410.
2011-11-06 17:23:14 +01:00
Nick Mathewson
Roger Dingledine
Karsten Loesing
Sebastian Hahn
Robert Ransom
Karsten Loesing
Dan Rosenberg