tor - [no description]

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4	Nick Mathewson	2014-02-15
\|\
\| *	Update geoip6 to the February 2014 GeoIP database.	Karsten Loesing	2014-02-13
\| \|
* \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2014-02-15
\|\ \ \| \|/ \|/\|
\| *	Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3	Nick Mathewson	2014-02-15
\| \|\
\| \| *	Update to the February 2014 GeoIP database.	Karsten Loesing	2014-02-08
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-10-11
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-10-11
\| \|\\|
\| \| *	Update to the October 2013 GeoIP database.	Karsten Loesing	2013-10-11
\| \| \|
* \| \|	Partially revert "Clarify who learns about ContactInfo."	Nick Mathewson	2013-10-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013.
* \| \|	Clarify who learns about ContactInfo.	Karsten Loesing	2013-10-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly include bridges, and note that we archive and publish all descriptors. (We are not yet publishing ContactInfo lines contained in bridge descriptors, but maybe we'll want to do that soon, so let's err on the side of caution here.) Related to #9854.
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-09-16
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-09-16
\| \|\\|
\| \| *	Update to the September 2013 GeoIP database.	Karsten Loesing	2013-09-10
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-08-12
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-08-12
\| \|\\|
\| \| *	Update to the August 2013 GeoIP database.	Karsten Loesing	2013-08-12
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-07-08
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-07-08
\| \|\\|
\| \| *	Update to the July 2013 GeoIP database.	Karsten Loesing	2013-07-08
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-06-05
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-06-05
\| \|\\|
\| \| *	Update to the June 2013 GeoIP database.	Karsten Loesing	2013-06-05
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-05-20
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-05-20
\| \|\\|
\| \| *	Update to the May 2013 GeoIP database.	Karsten Loesing	2013-05-13
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-04-08
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-04-08
\| \|\\|
\| \| *	Update to the April 2013 GeoIP database.	Karsten Loesing	2013-04-08
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	Nick Mathewson	2013-03-11
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-03-11
\| \|\\|
\| \| *	Update to the March 2013 GeoIP database.	Karsten Loesing	2013-03-07
\| \| \|
* \| \|	Merge remote-tracking branch 'karsten/geoip-manual-update'	Nick Mathewson	2013-02-08
\|\ \ \
\| * \| \|	Comment out now obsolete change in geoip-manual.	Karsten Loesing	2013-02-08
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/maint-0.2.3'	Nick Mathewson	2013-02-08
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-02-08
\| \|\\|
\| \| *	Update to the February 2013 GeoIP database.	Karsten Loesing	2013-02-08
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3'	Nick Mathewson	2013-01-14
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2013-01-14
\| \|\\|
\| \| *	Update to the January 2013 GeoIP database.	Karsten Loesing	2013-01-05
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/maint-0.2.3'	Nick Mathewson	2012-12-13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/config/geoip
\| * \|	Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3	Nick Mathewson	2012-12-13
\| \|\\|
\| \| *	Add link explaining how the geoip file was created.	Karsten Loesing	2012-12-13
\| \| \|
\| \| *	Update to the December 2012 GeoIP database.	Karsten Loesing	2012-12-13
\| \| \|
\| \| *	Update to the November 2012 GeoIP database.	Karsten Loesing	2012-12-13
\| \| \|
\| * \|	Revert "6819: typo in torrc.sample.in"	Nick Mathewson	2012-09-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161. We don't actually want to be changing the torrc.sample on stable or near-stable stuff, since doing so makes pointless busywork for debian users.
* \| \|	Update to the December 2012 GeoIP database.	Karsten Loesing	2012-12-06
\| \| \|
* \| \|	Update to the November 2012 GeoIP database.	Karsten Loesing	2012-11-27
\| \| \|
* \| \|	Add script to fix "A1" entries in geoip file.	Karsten Loesing	2012-11-27
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #6266.
* \| \|	Actually distribute the geoip6 file.	Nick Mathewson	2012-11-13
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes a bug (with no ticket) on 0.2.4.6-alpha.
* \| \|	Update geoip6.	Linus Nordberg	2012-10-17
\| \| \|