 Nick Mathewson
|
f12b253639
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
5ae391762c
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
 Karsten Loesing
|
d43cba6c69
Update to the January 1 2011 Maxmind GeoLite Country database.
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
9bbb4a1b40
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
732275bb81
Describe tor-resolve defaults. Bug 2364.
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
d16923a35d
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
54135b72f8
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
045e6ebd31
Remove a loud info log message
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
0a35ac6a22
Correctly detect and exclude addresses outside of our virtual address range
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
2be65619f9
Fix wide lines in control.c
|
%!s(int64=15) %!d(string=hai) anos |
 Damian Johnson
|
6661e16e7c
GETINFO options for querying traffic usage
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
3bc235d979
Fix a strdup() of uninitialized buffer in addressmap_get_virtual_address
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
d4b265d692
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
d6329eda96
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
d6b49c55c5
Merge branch 'bug2328_021' into maint-0.2.1
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
2008728df7
Notice a little faster if we're running out of virtual addresses
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
eabddd8ca0
Handle a NULL return from addressmap_get_virtual_address
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
31d6659d97
Fix a double-counting bug in addrmap_get_virtual_address
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
fd8f7991e4
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
0e9d7f105d
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
e4320689cc
Note that Tor requires Automake 1.7. Fixes bug 2305
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
a87a55a9b6
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
f089804332
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
e365aee971
Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
a96b46570f
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
cee433d751
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
e09ab69703
Check size against SIZE_T_CEILING in realloc too.
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
0489f7e004
Merge remote branch 'origin/maint-0.2.2'
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
27cefef3a2
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
|
%!s(int64=15) %!d(string=hai) anos |
|
Nick Mathewson
|
8932753169
Merge remote branch 'rransom/bug2327-v2'
|
%!s(int64=15) %!d(string=hai) anos |
