|  Nick Mathewson | 3e68db02c4
							
							In ntmain, call set_main_thread() before running the loop. | 8 years ago | 
				
					
						|  Nick Mathewson | 93b28972c1
							
							Merge branch 'maint-0.2.5' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | 9696021593
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Karsten Loesing | 1280de42a4
							
							Update geoip and geoip6 to the August 3 2017 database. | 8 years ago | 
				
					
						|  Nick Mathewson | 58e1c6dd86
							
							Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 8500f0e4e1
							
							Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 2b94b0ea72
							
							Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | f6ecda8400
							
							Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 0e7558ab64
							
							Merge branch 'maint-0.2.7-redux' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | 925ef048a9
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | a48ae2aa67
							
							Merge branch 'maint-0.2.6' into maint-0.2.7-redux | 8 years ago | 
				
					
						|  Nick Mathewson | 6862eada65
							
							Merge branch 'maint-0.2.5' into maint-0.2.6 | 8 years ago | 
				
					
						|  Nick Mathewson | 0bfd1c318c
							
							Merge branch 'maint-0.2.4' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | 6199e27a2b
							
							Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4 | 8 years ago | 
				
					
						|  Nick Mathewson | 24ddf5862e
							
							Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 5c5eb0f095
							
							Merge branch 'maint-0.2.7-redux' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | ddd66cc019
							
							Merge branch 'maint-0.2.6' into maint-0.2.7-redux | 8 years ago | 
				
					
						|  Nick Mathewson | f794b40ec0
							
							Merge branch 'maint-0.2.5' into maint-0.2.6 | 8 years ago | 
				
					
						|  Nick Mathewson | af39c13a03
							
							Merge branch 'maint-0.2.4' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | f17f7a4fdf
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | ebb441ded2
							
							Point travis to #tor-ci, not #tor-bots | 8 years ago | 
				
					
						|  Nick Mathewson | f226d6460d
							
							Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | dcc477cb53
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | fbf93614c9
							
							Merge branch 'maint-0.2.7-redux' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | c362c6a852
							
							Merge branch 'maint-0.2.6' into maint-0.2.7-redux | 8 years ago | 
				
					
						|  Nick Mathewson | 0ad5a6b034
							
							Merge branch 'maint-0.2.5' into maint-0.2.6 | 8 years ago | 
				
					
						|  Nick Mathewson | 09618bc488
							
							Merge branch 'maint-0.2.4' into maint-0.2.5 | 8 years ago | 
				
					
						|  Nick Mathewson | 0117e2ea0d
							
							Merge branch 'bug23030_029_v2' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 32b9edeb91
							
							Fix build warnings from Coverity related to our BUG macro | 8 years ago | 
				
					
						|  Nick Mathewson | 6d3c5b8fb5
							
							Merge branch 'bug22915_029_2' into maint-0.2.9 | 8 years ago |