 Nick Mathewson
|
71d786b2d3
Merge branch 'bug2320'
|
vor 15 Jahren |
|
Nick Mathewson
|
3dbfc6a734
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
1e37d8678a
Merge branch 'bug2331' into maint-0.2.2
|
vor 15 Jahren |
|
Nick Mathewson
|
f4756051fe
add a missing "not" in bug2331 changelog
|
vor 15 Jahren |
|
Nick Mathewson
|
cbcae4aef1
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
597433bcec
Merge branch 'bug2346' into maint-0.2.2
|
vor 15 Jahren |
|
Nick Mathewson
|
5044cb9752
Explain bug2346 fix better based on suggestions from arma
|
vor 15 Jahren |
|
Nick Mathewson
|
c9f8a5eebc
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
aa45e82593
Pull up more data when parsing socks messages
|
vor 15 Jahren |
|
Nick Mathewson
|
95968a625e
Wait 60 minutes before retrying failed state save; bug2346
|
vor 15 Jahren |
|
Nick Mathewson
|
f12b253639
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
5ae391762c
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
vor 15 Jahren |
 Karsten Loesing
|
d43cba6c69
Update to the January 1 2011 Maxmind GeoLite Country database.
|
vor 15 Jahren |
|
Nick Mathewson
|
9bbb4a1b40
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
732275bb81
Describe tor-resolve defaults. Bug 2364.
|
vor 15 Jahren |
|
Nick Mathewson
|
d16923a35d
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
54135b72f8
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
vor 15 Jahren |
|
Nick Mathewson
|
045e6ebd31
Remove a loud info log message
|
vor 15 Jahren |
|
Nick Mathewson
|
0a35ac6a22
Correctly detect and exclude addresses outside of our virtual address range
|
vor 15 Jahren |
|
Nick Mathewson
|
2be65619f9
Fix wide lines in control.c
|
vor 15 Jahren |
 Damian Johnson
|
6661e16e7c
GETINFO options for querying traffic usage
|
vor 15 Jahren |
|
Nick Mathewson
|
d4165ef8b4
Use autoconf's FLEXIBLE_ARRAY_MEMBER for unspecified-length arrays
|
vor 15 Jahren |
|
Nick Mathewson
|
3bc235d979
Fix a strdup() of uninitialized buffer in addressmap_get_virtual_address
|
vor 15 Jahren |
|
Nick Mathewson
|
d4b265d692
Merge remote branch 'origin/maint-0.2.2'
|
vor 15 Jahren |
|
Nick Mathewson
|
d6329eda96
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
vor 15 Jahren |
|
Nick Mathewson
|
d6b49c55c5
Merge branch 'bug2328_021' into maint-0.2.1
|
vor 15 Jahren |
|
Nick Mathewson
|
2008728df7
Notice a little faster if we're running out of virtual addresses
|
vor 15 Jahren |
|
Nick Mathewson
|
eabddd8ca0
Handle a NULL return from addressmap_get_virtual_address
|
vor 15 Jahren |
|
Nick Mathewson
|
31d6659d97
Fix a double-counting bug in addrmap_get_virtual_address
|
vor 15 Jahren |
|
Nick Mathewson
|
240fa42aac
Fix size_t vs unsigned comparison too
|
vor 15 Jahren |
